← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock-plug-ins/oneiric-updates

« back to all changes in this revision

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

  • Committer: Kees Cook
  • Date: 2011-08-11 23:17:39 UTC
  • mfrom: (20.1.1 cairo-dock-plug-ins)
  • Revision ID: kees@outflux.net-20110811231739-cteedan51tmdg77v
Tags: 2.4.0~0beta2-0ubuntu1
releasing version 2.4.0~0beta2-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
GMenu/src/applet-menu.c
273
273
                                (GDestroyNotify) g_object_unref);
274
274
 
275
275
        if (myConfig.bHasIcons)
 
276
        {
 
277
#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
 
278
                gtk_image_menu_item_set_always_show_image (
 
279
                        GTK_IMAGE_MENU_ITEM (image_menu_item), TRUE);
 
280
#endif
276
281
                gtk_image_menu_item_set_image (
277
282
                        GTK_IMAGE_MENU_ITEM (image_menu_item), image);
 
283
        }
278
284
 
279
285
        g_signal_connect_data (image, "map",
280
286
                               G_CALLBACK (image_menu_shown), icon,
514
520
                                        (GDestroyNotify) g_object_unref);
515
521
                gtk_widget_show (image);
516
522
                if (myConfig.bHasIcons)
 
523
                {
 
524
#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
 
525
                        gtk_image_menu_item_set_always_show_image (
 
526
                                GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
 
527
#endif
517
528
                        gtk_image_menu_item_set_image (
518
529
                                GTK_IMAGE_MENU_ITEM (menuitem), image);
 
530
                }
519
531
        } else if (icon_size != GTK_ICON_SIZE_INVALID)
520
532
                g_signal_connect (menuitem, "size_request",
521
533
                                  G_CALLBACK (image_menuitem_size_request),