diff -Nru cardapio-0.9.202/debian/changelog cardapio-0.9.202/debian/changelog --- cardapio-0.9.202/debian/changelog 2014-04-18 09:44:35.000000000 +0000 +++ cardapio-0.9.202/debian/changelog 2014-04-18 12:56:21.000000000 +0000 @@ -1,7 +1,9 @@ -cardapio (0.9.202-0recipe887+1~custom~webupd8~trusty) trusty; urgency=medium +cardapio (0.9.202-0recipe887+1~custom~webupd8~trusty2) trusty; urgency=medium * Added fix-gtk3-bookmarks-path.patch * Added gnome-session-logout-shutdown-fix.patch + * added Panel-icon-fix.patch + * Added reenable-applet-preferences-tab-on-gnome-panel.patch -- Alin Andrei Fri, 18 Apr 2014 15:41:01 +0000 diff -Nru cardapio-0.9.202/debian/patches/panel-icon-fix.patch cardapio-0.9.202/debian/patches/panel-icon-fix.patch --- cardapio-0.9.202/debian/patches/panel-icon-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ cardapio-0.9.202/debian/patches/panel-icon-fix.patch 2014-04-18 12:31:16.000000000 +0000 @@ -0,0 +1,32 @@ +--- a/src/gnomepanel/CardapioGnome3Applet.py ++++ b/src/gnomepanel/CardapioGnome3Applet.py +@@ -45,11 +45,17 @@ + + ''' Create a new CardapioApplet instance ''' + def __init__(self,applet): ++ settings = Gtk.Settings.get_default() ++ settings.set_property('gtk-button-images', True) + self.applet = applet + self.button = Gtk.ToggleButton() + self.button.set_relief(Gtk.ReliefStyle.NONE) + self.button.set_label("Menu") +- ++ style_context = self.button.get_style_context() ++ css_provider = Gtk.CssProvider() ++ css = "GtkButton { padding: 0px 3px; } " ++ css_provider.load_from_data(css) ++ style_context.add_provider(css_provider,Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + self.changing = False + + try: +--- a/src/SettingsHelper.py ++++ b/src/SettingsHelper.py +@@ -90,7 +90,7 @@ + self.read_config_option(s, 'autohide delay' , 250 ) # msec + self.read_config_option(s, 'keybinding' , 'space' ) # the user should use gtk.accelerator_parse('space') to see if the string is correct! + self.read_config_option(s, 'applet label' , _('Menu') ) # string +- self.read_config_option(s, 'applet icon' , 'start-here' , override_empty_str = False) # string (either a path to the icon, or an icon name) ++ self.read_config_option(s, 'applet icon' , 'distributor-logo' , override_empty_str = False) # string (either a path to the icon, or an icon name) + self.read_config_option(s, 'pinned items' , [] ) + self.read_config_option(s, 'side pane items' , default_side_pane_items ) + self.read_config_option(s, 'active plugins' , ['pinned', 'places', 'applications', 'zeitgeist_simple', 'google', 'command_launcher', 'software_center']) diff -Nru cardapio-0.9.202/debian/patches/reenable-applet-preferences-tab-on-gnome-panel.patch cardapio-0.9.202/debian/patches/reenable-applet-preferences-tab-on-gnome-panel.patch --- cardapio-0.9.202/debian/patches/reenable-applet-preferences-tab-on-gnome-panel.patch 1970-01-01 00:00:00.000000000 +0000 +++ cardapio-0.9.202/debian/patches/reenable-applet-preferences-tab-on-gnome-panel.patch 2014-04-18 12:53:02.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/src/OptionsWindow.py ++++ b/src/OptionsWindow.py +@@ -96,7 +96,7 @@ + + if panel_type is not None: self.panel_type = panel_type + +- if self.panel_type == PANEL_TYPE_NONE or self.panel_type == PANEL_TYPE_DOCKY: ++ if self.panel_type == PANEL_TYPE_DOCKY: + self.get_widget('AppletOptionPane').hide() + + elif self.panel_type == PANEL_TYPE_AWN: diff -Nru cardapio-0.9.202/debian/patches/series cardapio-0.9.202/debian/patches/series --- cardapio-0.9.202/debian/patches/series 2014-02-24 13:43:36.000000000 +0000 +++ cardapio-0.9.202/debian/patches/series 2014-04-18 12:53:09.000000000 +0000 @@ -1,2 +1,4 @@ fix-gtk3-bookmarks-path.patch gnome-session-logout-shutdown-fix.patch +panel-icon-fix.patch +reenable-applet-preferences-tab-on-gnome-panel.patch