diff options
Diffstat (limited to 'community/cinnamon/gnome-3.8.patch')
| -rw-r--r-- | community/cinnamon/gnome-3.8.patch | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch index e455a835e..4053a151b 100644 --- a/community/cinnamon/gnome-3.8.patch +++ b/community/cinnamon/gnome-3.8.patch @@ -196,11 +196,9 @@ index f12f8c5..939ea70 100644 <schema id="org.cinnamon.screensaver" path="/org/cinnamon/screensaver/"> <key name="default-message" type="s"> <default>""</default> -diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py -index f964aed..4a38c84 100644 ---- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py -+++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py -@@ -232,11 +232,11 @@ def getFirstFileFromBackgroundXml(self, filename): +--- linuxmint-Cinnamon-a464dc9.orig/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 18:01:56.000000000 +0200 ++++ linuxmint-Cinnamon-a464dc9/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 23:36:46.718385152 +0200 +@@ -232,11 +232,11 @@ class BackgroundWallpaperPane (Gtk.VBox): @@ -214,7 +212,7 @@ index f964aed..4a38c84 100644 self._sidepage = sidepage scw = Gtk.ScrolledWindow() -@@ -263,15 +263,15 @@ def _on_selection_changed(self, iconview): +@@ -263,15 +263,15 @@ if wallpaper: for key in wallpaper: if key == "filename": @@ -235,16 +233,7 @@ index f964aed..4a38c84 100644 if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""): self._sidepage.remove_wallpaper_button.set_sensitive(True) -@@ -364,7 +364,7 @@ def run(self): - return res - - class BackgroundSlideshowPane(Gtk.Table): -- def __init__(self, sidepage, gnome_background_schema, cinnamon_background_schema): -+ def __init__(self, sidepage, cinnamon_background_schema): - Gtk.Table.__init__(self) - self.set_col_spacings(5) - self.set_row_spacings(5) -@@ -445,12 +445,11 @@ def _do_update_list(self, folder, recursive, delay, transition_duration = 0): +@@ -445,12 +445,11 @@ f = open(filename, "w") f.write(xml_data) f.close() @@ -253,23 +242,23 @@ index f964aed..4a38c84 100644 class BackgroundSidePage (SidePage): def __init__(self, name, icon, keywords, advanced, content_box): - SidePage.__init__(self, name, icon, keywords, advanced, content_box, True) + SidePage.__init__(self, name, icon, keywords, advanced, content_box, -1) - self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background") self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background") self._add_wallpapers_dialog = AddWallpapersDialog() -@@ -515,8 +514,8 @@ def build(self, advanced): +@@ -515,8 +514,8 @@ self.mainbox.set_visible_window(False) self.content_box.pack_start(self.mainbox, True, True, 3) - self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema) - self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema) + self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema) -+ self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema) ++ self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema, self._cinnamon_background_schema) if self._cinnamon_background_schema["mode"] == "slideshow": self.mainbox.add(self.slideshow_pane) else: -@@ -536,21 +535,21 @@ def build(self, advanced): +@@ -536,21 +535,21 @@ l = Gtk.Label(_("Picture aspect")) l.set_alignment(0, 0.5) advanced_options_box.pack_start(l, False, False, 0) @@ -295,6 +284,7 @@ index f964aed..4a38c84 100644 hbox.pack_start(self.secondary_color, False, False, 2) advanced_options_box.pack_start(hbox, False, False, 0) self.content_box.show_all() + diff --git a/js/ui/main.js b/js/ui/main.js index 74154ab..99aee95 100644 --- a/js/ui/main.js |