summaryrefslogtreecommitdiff
path: root/openbox/client_list_menu.c
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2007-12-18 21:12:52 +0100
committerMikael Magnusson <mikachu@comhem.se>2007-12-18 21:12:52 +0100
commit2b8b5da04b14af1639143cc332874c7e1a03a8bb (patch)
tree74fc76cd53dc5684b8009960e896ecbc91cf0891 /openbox/client_list_menu.c
parent9586ad246dae1f1de89f2070722cfa0c0c41c477 (diff)
parent46f90bca8ab55a2f43bf33af1adf178bd0bd81d9 (diff)
Merge branch 'backport'
Diffstat (limited to 'openbox/client_list_menu.c')
-rw-r--r--openbox/client_list_menu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 5f6a832d..33f4b6f5 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -137,10 +137,10 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
for (i = 0; i < screen_num_desktops; ++i) {
ObMenu *submenu;
gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
- DesktopData *data = g_new(DesktopData, 1);
+ DesktopData *ddata = g_new(DesktopData, 1);
- data->desktop = i;
- submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
+ ddata->desktop = i;
+ submenu = menu_new(name, screen_desktop_names[i], FALSE, ddata);
menu_set_update_func(submenu, desk_menu_update);
menu_set_execute_func(submenu, desk_menu_execute);
menu_set_destroy_func(submenu, desk_menu_destroy);