← Back to branch summary

~ubuntu-branches/ubuntu/vivid/xfdesktop4/vivid-proposed

« back to all changes in this revision

Viewing changes to src/xfdesktop-window-icon-manager.c

  • Committer: Package Import Robot
  • Author(s): Sean Davis
  • Date: 2014-08-11 22:25:48 UTC
  • mfrom: (1.5.11)
  • Revision ID: package-import@ubuntu.com-20140811222548-osc1fppwc8k8r3ix
Tags: 4.11.7-0ubuntu1
https://launchpad.net/bugs/1318307
* New upstream development release
* debian/patches/xubuntu_set-accountsservice-user-bg.patch: update
  patch to only update on first workspace filename change (LP: #1318307)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xfdesktop-window-icon-manager.c
285
285
                                                sizeof(gpointer) * n_ws);
286
286
    
287
287
    if(ws_num != n_ws - 1) {
288
 
        g_memmove(wmanager->priv->icon_workspaces + ws_num + 1,
289
 
                  wmanager->priv->icon_workspaces + ws_num,
290
 
                  sizeof(gpointer) * (n_ws - ws_num - 1));
 
288
        memmove(wmanager->priv->icon_workspaces + ws_num + 1,
 
289
                wmanager->priv->icon_workspaces + ws_num,
 
290
                sizeof(gpointer) * (n_ws - ws_num - 1));
291
291
    }
292
292
    
293
293
    wmanager->priv->icon_workspaces[ws_num] = g_new0(XfdesktopWindowIconWorkspace,
314
314
    g_free(wmanager->priv->icon_workspaces[ws_num]);
315
315
    
316
316
    if(ws_num != n_ws) {
317
 
        g_memmove(wmanager->priv->icon_workspaces + ws_num,
318
 
                  wmanager->priv->icon_workspaces + ws_num + 1,
319
 
                  sizeof(gpointer) * (n_ws - ws_num));
 
317
        memmove(wmanager->priv->icon_workspaces + ws_num,
 
318
                wmanager->priv->icon_workspaces + ws_num + 1,
 
319
                sizeof(gpointer) * (n_ws - ws_num));
320
320
    }
321
321
    
322
322
    wmanager->priv->icon_workspaces = g_realloc(wmanager->priv->icon_workspaces,