← Back to branch summary

~jgonzalezdr/cairo-dock-plug-ins/suspend-workaround-applet_3.3

« back to all changes in this revision

Viewing changes to GMenu/src/applet-menu.c

  • Committer: Fabrice Rey
  • Date: 2013-09-27 23:42:26 UTC
  • Revision ID: fabounet03@gmail.com-20130927234226-d03se1r91jmffdu2
All: updated to use the new menu API

Show diffs side-by-side

added added

removed removed

Lines of Context:
GMenu/src/applet-menu.c
35
35
        pSharedMemory->pTrees = NULL;
36
36
        
37
37
        // create the menu
38
 
        myData.pMenu = gtk_menu_new ();
 
38
        myData.pMenu = gldi_menu_new (myIcon);
39
39
        
40
40
        cd_menu_append_entry ();
41
41
        
134
134
// == cairo_dock_add_in_menu_with_stock_and_data   with icon size 24
135
135
static GtkWidget *_append_one_item_to_menu (const gchar *cLabel, const gchar *gtkStock, GFunc pFunction, GtkWidget *pMenu, gpointer pData)
136
136
{
137
 
        GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label (cLabel);
138
 
        if (gtkStock)
139
 
        {
140
 
                GtkWidget *image = NULL;
141
 
                if (*gtkStock == '/')
142
 
                {
143
 
                        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (gtkStock, myData.iPanelDefaultMenuIconSize, myData.iPanelDefaultMenuIconSize, NULL);
144
 
                        image = gtk_image_new_from_pixbuf (pixbuf);
145
 
                        g_object_unref (pixbuf);
146
 
                }
147
 
                else
148
 
                {
149
 
                        const gchar *cIconPath = cairo_dock_search_icon_s_path (gtkStock, myData.iPanelDefaultMenuIconSize);
150
 
                        if (cIconPath == NULL)
151
 
                        {
152
 
                                cIconPath = g_strconcat (MY_APPLET_SHARE_DATA_DIR"/", gtkStock, ".svg", NULL);
153
 
                        }
154
 
                        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, myData.iPanelDefaultMenuIconSize, myData.iPanelDefaultMenuIconSize, NULL);
155
 
                        image = gtk_image_new_from_pixbuf (pixbuf);
156
 
                        g_object_unref (pixbuf);
157
 
                }
158
 
                _gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), image);
159
 
        }
 
137
        GtkWidget *pMenuItem = gldi_menu_item_new_full (cLabel, gtkStock, FALSE, GTK_ICON_SIZE_LARGE_TOOLBAR);
 
138
        
160
139
        gtk_menu_shell_append  (GTK_MENU_SHELL (pMenu), pMenuItem);
161
140
        if (pFunction)
162
141
                g_signal_connect (G_OBJECT (pMenuItem), "activate", G_CALLBACK (pFunction), pData);