← Back to branch summary

~ubuntu-branches/ubuntu/utopic/awn-extras-applets/utopic

« back to all changes in this revision

Viewing changes to applets/maintained/cairo-menu/cairo-main-icon.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2010-04-11 22:38:55 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100411223855-mamzuv887xyms08b
Tags: 0.4.0-0ubuntu1
https://launchpad.net/bugs/511256
https://launchpad.net/bugs/545164
https://launchpad.net/bugs/556175
https://launchpad.net/bugs/558463
https://launchpad.net/bugs/551119
https://launchpad.net/bugs/552376
* New upstream release.
 - Close cairo-menu after a click (LP: #511256)
 - Fix crash of awn-system-monitor (LP: #545164)
 - Fix crash when removing a volume >1 or adding volume >1 or using prefs
   while > 1 volumes is present (LP: #556175)
 - Fix crash of media-control when Rhythmbox quit (LP: #558463)
 - Fix crash of file-browser-launcher when there is no .gtk-bookmarks
   (LP: #551119)
* debian/awn-c-extras.install: 
 - Install icons and ini files for webapplets
* debian/awn-python-core.install:
 - Install ui file for comics (LP: #552376)
* debian/patches:
 - 03-remove-cairo-menu-pref.patch: Merged upstream.
 - 04-tomboy-threading-free.patch: Merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/maintained/cairo-menu/cairo-main-icon.c
319
319
    if (!priv->context_menu)
320
320
    {
321
321
      priv->context_menu = awn_applet_create_default_menu (AWN_APPLET(priv->applet));
 
322
      gtk_menu_set_screen(GTK_MENU(priv->context_menu), NULL);
322
323
      item = awn_themed_icon_create_remove_custom_icon_item (AWN_THEMED_ICON(icon),NULL);
323
324
      gtk_menu_shell_append (GTK_MENU_SHELL(priv->context_menu), item);
324
 
      item = gtk_image_menu_item_new_with_label("Applet Preferences");
 
325
/*      item = gtk_image_menu_item_new_with_label("Applet Preferences");
325
326
      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(item), 
326
327
                                     gtk_image_new_from_stock (GTK_STOCK_PREFERENCES,GTK_ICON_SIZE_MENU));
327
328
      gtk_widget_show(item);
328
 
      gtk_menu_set_screen(GTK_MENU(priv->context_menu), NULL);
329
329
      gtk_menu_shell_append(GTK_MENU_SHELL(priv->context_menu), item);
 
330
       */
330
331
//      g_signal_connect(G_OBJECT(item), "button-press-event", G_CALLBACK(_show_prefs), NULL);
331
332
      item=awn_applet_create_about_item_simple(AWN_APPLET(priv->applet),
332
333
                                               "Copyright 2007,2008, 2009 Rodney Cryderman <rcryderman@gmail.com>",