diff -Nru cardapio-0.9.201/debian/changelog cardapio-0.9.202/debian/changelog --- cardapio-0.9.201/debian/changelog 2013-12-24 15:41:01.000000000 +0000 +++ cardapio-0.9.202/debian/changelog 2014-04-18 12:56:21.000000000 +0000 @@ -1,4 +1,13 @@ -cardapio (0.9.201-0recipe887~eugenesan~ubuntu14.04.1) trusty; urgency=low +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 + +cardapio (0.9.202-0recipe887~custom~webupd8~trusty) trusty; urgency=low * Auto build. diff -Nru cardapio-0.9.201/debian/patches/fix-gtk3-bookmarks-path.patch cardapio-0.9.202/debian/patches/fix-gtk3-bookmarks-path.patch --- cardapio-0.9.201/debian/patches/fix-gtk3-bookmarks-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ cardapio-0.9.202/debian/patches/fix-gtk3-bookmarks-path.patch 2014-02-24 13:47:22.000000000 +0000 @@ -0,0 +1,19 @@ +--- a/src/Cardapio.py ++++ b/src/Cardapio.py +@@ -157,6 +157,7 @@ + + self.cardapio_path = cardapio_path + self._home_folder_path = os.path.abspath(os.path.expanduser('~')) ++ self._gtk3_bookmarks_path = os.path.join(BaseDirectory.xdg_config_home, 'gtk-3.0') + + logging.info('Setting up DBus...') + self._setup_dbus() +@@ -1953,7 +1954,7 @@ + + xdg_folders_file.close() + +- bookmark_file_path = os.path.join(self._home_folder_path, '.gtk-bookmarks') ++ bookmark_file_path = os.path.join(self._gtk3_bookmarks_path, 'bookmarks') + bookmark_file = file(bookmark_file_path, 'r') + # TODO: xdg_folders_file = codecs.open(bookmark_file_path, mode='r', encoding='utf-8') + diff -Nru cardapio-0.9.201/debian/patches/gnome-session-logout-shutdown-fix.patch cardapio-0.9.202/debian/patches/gnome-session-logout-shutdown-fix.patch --- cardapio-0.9.201/debian/patches/gnome-session-logout-shutdown-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ cardapio-0.9.202/debian/patches/gnome-session-logout-shutdown-fix.patch 2014-02-24 13:30:05.000000000 +0000 @@ -0,0 +1,14 @@ +--- a/src/DesktopEnvironment.py ++++ b/src/DesktopEnvironment.py +@@ -54,8 +54,8 @@ + self.file_open = "xdg-open '%s'" + self.connect_to_server = which('nautilus-connect-server') + self.lock_screen = 'gnome-screensaver-command --lock' +- self.save_session = 'gnome-session-save --logout-dialog' +- self.shutdown = 'gnome-session-save --shutdown-dialog' ++ self.save_session = 'gnome-session-quit --logout' ++ self.shutdown = 'gnome-session-quit --power-off' + self.execute_in_terminal = None + + if self.environment == 'kde' : pass + diff -Nru cardapio-0.9.201/debian/patches/panel-icon-fix.patch cardapio-0.9.202/debian/patches/panel-icon-fix.patch --- cardapio-0.9.201/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.201/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.201/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.201/debian/patches/series cardapio-0.9.202/debian/patches/series --- cardapio-0.9.201/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ cardapio-0.9.202/debian/patches/series 2014-04-18 12:53:09.000000000 +0000 @@ -0,0 +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 diff -Nru cardapio-0.9.201/debian/source/format cardapio-0.9.202/debian/source/format --- cardapio-0.9.201/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ cardapio-0.9.202/debian/source/format 2014-04-18 11:58:20.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)