Quoting Scott Moreau <oreaus [at ] gmail [dot] com>:
Looks like it ate your patches.
somebody feed the list bot please. Trying again to send the patches (it could also be my webmail interface eating them)
compiz/compizconfig/simple-ccsm<http://cgit.compiz.org/fusion/compizconfig/simple-ccsm/> repo should be created for 0.9 with a compiz-0.8 branch reflecting the current master state (fusion/compizconfig/simple-ccsm).
Errr... sorry, you reached the end of my git knowledge (well, I can certainly read and try.. but don't really want to mess up the existing tree... that would be a shame).
But yes, branching master from 0.8 would certainly be required. If you have some instructions on doing this 'the right way'(tm), I'll gladly do that (hopefully the way described)
Dominique
>From f07dee9dbb929bb4e6cfd522d7ae1446d4f5c4fa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Wed, 17 Nov 2010 21:10:54 +0100 Subject: [PATCH 1/3] Track changes of libcompizconfig: Remove Multi-Screen settings and Display. --- simple-ccsm.in | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/simple-ccsm.in b/simple-ccsm.in index b09fd86..f444fce 100755 --- a/simple-ccsm.in +++ b/simple-ccsm.in @@ -494,7 +494,7 @@ class ProfilePage: if not box.get_model(): continue text = box.get_active_text() - setting = plugin.Screens[0][settingName] + setting = plugin.Screen[settingName] if len(setting.Value) >= 1: value = setting.Value[0] if names[settingName].has_key(value): @@ -618,7 +618,7 @@ class AnimationPage: text = widget.get_active_text() plugin = self.Context.Plugins['animation'] - setting = plugin.Screens[0][settingName] + setting = plugin.Screen[settingName] value = setting.Value if len(value) >= 1: if text: # Handle "chosen animation is in an extension plugin" case @@ -626,7 +626,7 @@ class AnimationPage: setting.Value = value self.Context.Write() else: - for setting in plugin.Groups[setting.Group][setting.SubGroup].Screens[0].values(): + for setting in plugin.Groups[setting.Group][setting.SubGroup].Screen.values(): setting.Reset() self.Context.Write() self.AnimationBoxChanged(widget, settingName) @@ -663,7 +663,7 @@ class AnimationPage: for boxName, settingName in AnimationSettings.items(): box = self.GladeXML.get_widget(boxName) - setting = plugin.Screens[0][settingName] + setting = plugin.Screen[settingName] info = setting.Info[1] itemsByValue = info[1] items = info[2] @@ -705,9 +705,9 @@ class EffectPage: else: self.SwitcherPlugins[plugin.ShortDesc] = plugin - setting = plugin.Display['next_key'] + setting = plugin.Screen['next_key'] self.SwitcherKeySettings[pluginName] = setting - setting = plugin.Display['prev_key'] + setting = plugin.Screen['prev_key'] self.ReverseSwitcherKeySettings[pluginName] = setting @@ -769,7 +769,7 @@ class EffectPage: # Exception for shift, since it has 2 modes if plugin.Name == 'shift': - setting = plugin.Screens[0]['mode'] + setting = plugin.Screen['mode'] if text.find(_("Cover")) != -1: setting.Value = 0 @@ -784,7 +784,7 @@ class EffectPage: text = widget.get_active_text() plugin = self.Context.Plugins['cubeaddon'] - setting = plugin.Screens[0]['deformation'] + setting = plugin.Screen['deformation'] value = setting.Info[2][text] if value != 0 and not plugin.Enabled: EnablePlugin(plugin, True) @@ -799,7 +799,7 @@ class EffectPage: value = widget.get_value() plugin = self.Context.Plugins['cube'] # Only change cube opacity on rotate - setting = plugin.Screens[0]['active_opacity'] + setting = plugin.Screen['active_opacity'] setting.Value = float(value) self.Context.Write() @@ -810,7 +810,7 @@ class EffectPage: value = widget.get_active() plugin = self.Context.Plugins['cubeaddon'] - setting = plugin.Screens[0]['reflection'] + setting = plugin.Screen['reflection'] setting.Value = value self.Context.Write() @@ -850,7 +850,7 @@ class EffectPage: return plugin = self.Context.Plugins['cube'] - setting = plugin.Screens[0]['active_opacity'] + setting = plugin.Screen['active_opacity'] value = setting.Value widget.set_value(int(value)) @@ -861,7 +861,7 @@ class EffectPage: return plugin = self.Context.Plugins['cubeaddon'] - setting = plugin.Screens[0]['reflection'] + setting = plugin.Screen['reflection'] value = setting.Value widget.set_active(value) @@ -877,7 +877,7 @@ class EffectPage: if plugin.Enabled: if plugin.Name == 'shift': modes = [_("Cover"), _("Flip")] - setting = plugin.Screens[0]['mode'] + setting = plugin.Screen['mode'] mode = modes[setting.Value] if mode in shortDesc: box.set_active(i) @@ -894,7 +894,7 @@ class EffectPage: return plugin = self.Context.Plugins['cubeaddon'] - setting = plugin.Screens[0]['deformation'] + setting = plugin.Screen['deformation'] items = sorted(setting.Info[2].items(), key=ccm.EnumSettingKeyFunc) for key, value in items: @@ -943,7 +943,7 @@ class DesktopPage: settingName = settings[name] value = widget.get_value() - self.Context.Plugins['core'].Screens[0][settingName].Value = value + self.Context.Plugins['core'].Screen[settingName].Value = value self.Context.Write() self.SetDesktopPreview() @@ -964,7 +964,7 @@ class DesktopPage: plugin.Enabled = True # exception for cube, since it requires rotate if plugin.Name == 'cube': - setting = self.Context.Plugins['core'].Screens[0]['vsize'] + setting = self.Context.Plugins['core'].Screen['vsize'] setting.Value = 1 # Cube can only use 1 vertical viewport EnablePlugin(self.Context.Plugins['rotate'], True) EnablePlugin(self.Context.Plugins['cubeaddon'], True) @@ -973,8 +973,8 @@ class DesktopPage: self.SetDesktopSize() def SetDesktopPreview(self): - hsize = self.Context.Plugins['core'].Screens[0]["hsize"].Value - vsize = self.Context.Plugins['core'].Screens[0]["vsize"].Value + hsize = self.Context.Plugins['core'].Screen["hsize"].Value + vsize = self.Context.Plugins['core'].Screen["vsize"].Value self.DesktopPreview.set_value((hsize, vsize)) def SetDesktopSize(self): @@ -983,7 +983,7 @@ class DesktopPage: for widgetName, settingName in scales.items(): widget = self.GladeXML.get_widget(widgetName) - setting = self.Context.Plugins['core'].Screens[0][settingName] + setting = self.Context.Plugins['core'].Screen[settingName] widget.set_value(setting.Value) def FillAppearenceBox(self): @@ -1063,7 +1063,7 @@ class ZoomPage: if identifier not in self.Widgets: plugin = self.Context.Plugins[pluginName] - setting = plugin.Display[settingName] + setting = plugin.Screen[settingName] widget = ccm.MakeSetting(setting) container = self.GladeXML.get_widget(containerName) container.pack_start(widget.EBox) -- 1.7.3.1
>From 438db3dace3a605b47f6b50e1f6ec6ff9d3b5ef8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Wed, 17 Nov 2010 21:21:09 +0100 Subject: [PATCH 2/3] Start compiz-manager with --replace. There might and most likely is a WM running. --- simple-ccsm.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simple-ccsm.in b/simple-ccsm.in index f444fce..a5d0aed 100755 --- a/simple-ccsm.in +++ b/simple-ccsm.in @@ -185,9 +185,9 @@ CompizName = "compiz" # Change to your default CompizEnableDesktopEffects = @enable_desktop_effects@ -CompizStartCommand = "compiz-manager" +CompizStartCommand = "compiz-manager --replace" CompizDryRunCommand = "CM_DRY=yes compiz-manager" -CompizNoChecksCommand = "SKIP_CHECKS=yes compiz-manager" +CompizNoChecksCommand = "SKIP_CHECKS=yes compiz-manager --replace" GnomeSession = "GNOME_DESKTOP_SESSION_ID" KdeSession = "KDE_FULL_SESSION" -- 1.7.3.1
>From db281da032dfdbf9a9753e1a711cb3d030d3269d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Wed, 17 Nov 2010 22:47:56 +0100 Subject: [PATCH 3/3] Bump version to 0.9.2.1 and create a NEWS file --- NEWS | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index e69de29..d72d069 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,4 @@ +Release 0.9.2.1 (2010-11-17 Dominique Leuenberger <[email protected]>) +======================================================================== +Synchronize API with libcompizconfig 0.9.2.1. + diff --git a/VERSION b/VERSION index bc600a0..5d08606 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.8.5 +VERSION=0.9.2.1 -- 1.7.3.1
_______________________________________________ dev mailing list [email protected] http://lists.compiz.org/mailman/listinfo/dev
