← Back to branch summary

~ubuntu-branches/ubuntu/vivid/indicator-appmenu/vivid-proposed

« back to all changes in this revision

Viewing changes to src/window-menu-model.c

  • Committer: Package Import Robot
  • Author(s): Automatic PS uploader, Lars Uebernickel, Automatic PS uploader
  • Date: 2012-12-14 02:01:28 UTC
  • mfrom: (1.1.36)
  • Revision ID: package-import@ubuntu.com-20121214020128-s2zotjq8dkhvy2ao
Tags: 12.10.4daily12.12.14-0ubuntu1
https://launchpad.net/bugs/1089997
[ Lars Uebernickel ]
* Hidden, non-existent 'empty' menu/indicator entries exported through
  DBus (LP: #1089997)

[ Automatic PS uploader ]
* Automatic snapshot from revision 225

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/window-menu-model.c
43
43
 
44
44
        /* Window Menus */
45
45
        GDBusMenuModel * win_menu_model;
46
 
        GtkMenu * win_menu;
 
46
        GtkMenuBar * win_menu;
47
47
        gulong win_menu_insert;
48
48
        gulong win_menu_remove;
49
49
};
356
356
                gtk_widget_insert_action_group(GTK_WIDGET(gmi), ACTION_MUX_PREFIX_WIN, menu->priv->win_actions);
357
357
        }
358
358
 
359
 
 
360
359
        entry->gmi = gmi;
361
360
 
362
361
        entry->entry.label = mi_find_label(GTK_WIDGET(gmi));
428
427
{
429
428
        menu->priv->win_menu_model = g_object_ref(model);
430
429
 
431
 
        menu->priv->win_menu = GTK_MENU(gtk_menu_new_from_model(model));
 
430
        menu->priv->win_menu = GTK_MENU_BAR(gtk_menu_bar_new_from_model(model));
432
431
        g_assert(menu->priv->win_menu != NULL);
433
432
        g_object_ref_sink(menu->priv->win_menu);
434
433