Hello community,
here is the log from the commit of package libcompizconfig-backend-gconf for openSUSE:Factory
checked in at Mon Nov 23 15:05:39 CET 2009.
--------
--- libcompizconfig-backend-gconf/libcompizconfig-backend-gconf.changes 2009-04-15 17:20:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/libcompizconfig-backend-gconf/libcompizconfig-backend-gconf.changes 2009-11-13 12:06:10.000000000 +0100
@@ -1,0 +2,9 @@
+Fri Nov 13 10:05:15 CET 2009 - dimstar@opensuse.org
+
+- Update to version 0.8.4:
+ + lp#407020 - Fix crash
+ + Fix setting integration for screenshot and terminal commands
+ + Don't allow empty modifiers for mouse_button_modifier
+ + Sync metacity with staticswitcher instead of switcher.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
compizconfig-backend-gconf-0.7.8.tar.bz2
New:
----
compizconfig-backend-gconf-0.8.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcompizconfig-backend-gconf.spec ++++++
--- /var/tmp/diff_new_pack.ugNRhp/_old 2009-11-23 15:03:24.000000000 +0100
+++ /var/tmp/diff_new_pack.ugNRhp/_new 2009-11-23 15:03:24.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libcompizconfig-backend-gconf (Version 0.7.8 )
+# spec file for package libcompizconfig-backend-gconf (Version 0.8.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,30 +18,43 @@
Name: libcompizconfig-backend-gconf
-BuildRequires: autoconf automake compiz-devel compiz-gnome gconf2-devel glib2-devel gtk2-devel intltool libcompizconfig-devel libxml2-devel libxslt-devel pkg-config pyrex python-compizconfig python-devel
-Url: http://opencompositing.org
+Version: 0.8.4
+Release: 1
License: GPL v2 or later
+Summary: This package contains gconf backend for Compizconfig-settings-manager(ccsm)
+Url: http://opencompositing.org
Group: System/X11/Utilities
+Source: compizconfig-backend-gconf-%{version}.tar.bz2
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: compiz-devel
+BuildRequires: compiz-gnome
+BuildRequires: gconf2-devel
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
+BuildRequires: intltool
+BuildRequires: libcompizconfig-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
+BuildRequires: pkg-config
+BuildRequires: pyrex
+BuildRequires: python-compizconfig
+BuildRequires: python-devel
PreReq: %fillup_prereq
-Version: 0.7.8
-Release: 2
-Requires: compiz libcompizconfig python-compizconfig python-xml libsexy libxml2-python
+Requires: compiz
+Requires: libcompizconfig
+Requires: libsexy
+Requires: libxml2-python
+Requires: python-compizconfig
+Requires: python-xml
Provides: libcompizconfig-backend
-Summary: This package contains gconf backend for Compizconfig-settings-manager(ccsm)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ia64
-Source: compizconfig-backend-gconf-%{version}.tar.bz2
%description
This package contains gconf backend for
Compizconfig-settings-manager(ccsm).
-
-
-Authors:
---------
- Dennis Kasprzyk
-
%prep
%setup -q -n compizconfig-backend-gconf-%{version}
@@ -51,7 +64,7 @@
%install
%makeinstall
-find %buildroot \( -name \*.la \) -print0 | xargs -0 rm -f
+find %{buildroot} \( -name \*.la \) -print0 | xargs -0 rm -f
%clean
%__rm -rf %{buildroot}
++++++ compizconfig-backend-gconf-0.7.8.tar.bz2 -> compizconfig-backend-gconf-0.8.4.tar.bz2 ++++++
++++ 10997 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compizconfig-backend-gconf-0.7.8/settings-backend/gconf.c new/compizconfig-backend-gconf-0.8.4/settings-backend/gconf.c
--- old/compizconfig-backend-gconf-0.7.8/settings-backend/gconf.c 2008-09-17 15:28:55.000000000 +0200
+++ new/compizconfig-backend-gconf-0.8.4/settings-backend/gconf.c 2009-10-14 02:40:31.000000000 +0200
@@ -115,15 +115,15 @@
} SpecialOption;
const SpecialOption specialOptions[] = {
- {"run_key", "core", FALSE,
+ {"run_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/panel_run_dialog", OptionKey},
- {"main_menu_key", "core", FALSE,
+ {"main_menu_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/panel_main_menu", OptionKey},
- {"run_command_screenshot_key", "core", FALSE,
+ {"run_command_screenshot_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_screenshot", OptionKey},
- {"run_command_window_screenshot_key", "core", FALSE,
+ {"run_command_window_screenshot_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_window_screenshot", OptionKey},
- {"run_command_terminal_key", "core", FALSE,
+ {"run_command_terminal_key", "gnomecompat", FALSE,
METACITY "/global_keybindings/run_command_terminal", OptionKey},
{"toggle_window_maximized_key", "core", FALSE,
@@ -172,9 +172,9 @@
{"fullscreen_visual_bell", "fade", TRUE,
METACITY "/general/visual_bell_type", OptionSpecial},
- {"next_key", "switcher", FALSE,
+ {"next_key", "staticswitcher", FALSE,
METACITY "/global_keybindings/switch_windows", OptionKey},
- {"prev_key", "switcher", FALSE,
+ {"prev_key", "staticswitcher", FALSE,
METACITY "/global_keybindings/switch_windows_backward", OptionKey},
{"toggle_sticky_key", "extrawm", FALSE,
@@ -182,54 +182,54 @@
{"toggle_fullscreen_key", "extrawm", FALSE,
METACITY "/window_keybindings/toggle_fullscreen", OptionKey},
- {"command0", "core", FALSE,
+ {"command0", "commands", FALSE,
METACITY "/keybinding_commands/command_1", OptionString},
- {"command1", "core", FALSE,
+ {"command1", "commands", FALSE,
METACITY "/keybinding_commands/command_2", OptionString},
- {"command2", "core", FALSE,
+ {"command2", "commands", FALSE,
METACITY "/keybinding_commands/command_3", OptionString},
- {"command3", "core", FALSE,
+ {"command3", "commands", FALSE,
METACITY "/keybinding_commands/command_4", OptionString},
- {"command4", "core", FALSE,
+ {"command4", "commands", FALSE,
METACITY "/keybinding_commands/command_5", OptionString},
- {"command5", "core", FALSE,
+ {"command5", "commands", FALSE,
METACITY "/keybinding_commands/command_6", OptionString},
- {"command6", "core", FALSE,
+ {"command6", "commands", FALSE,
METACITY "/keybinding_commands/command_7", OptionString},
- {"command7", "core", FALSE,
+ {"command7", "commands", FALSE,
METACITY "/keybinding_commands/command_8", OptionString},
- {"command8", "core", FALSE,
+ {"command8", "commands", FALSE,
METACITY "/keybinding_commands/command_9", OptionString},
- {"command9", "core", FALSE,
+ {"command9", "commands", FALSE,
METACITY "/keybinding_commands/command_10", OptionString},
- {"command10", "core", FALSE,
+ {"command10", "commands", FALSE,
METACITY "/keybinding_commands/command_11", OptionString},
- {"command11", "core", FALSE,
+ {"command11", "commands", FALSE,
METACITY "/keybinding_commands/command_12", OptionString},
- {"run_command0_key", "core", FALSE,
+ {"run_command0_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_1", OptionKey},
- {"run_command1_key", "core", FALSE,
+ {"run_command1_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_2", OptionKey},
- {"run_command2_key", "core", FALSE,
+ {"run_command2_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_3", OptionKey},
- {"run_command3_key", "core", FALSE,
+ {"run_command3_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_4", OptionKey},
- {"run_command4_key", "core", FALSE,
+ {"run_command4_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_5", OptionKey},
- {"run_command5_key", "core", FALSE,
+ {"run_command5_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_6", OptionKey},
- {"run_command6_key", "core", FALSE,
+ {"run_command6_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_7", OptionKey},
- {"run_command7_key", "core", FALSE,
+ {"run_command7_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_8", OptionKey},
- {"run_command8_key", "core", FALSE,
+ {"run_command8_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_9", OptionKey},
- {"run_command9_key", "core", FALSE,
+ {"run_command9_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_10", OptionKey},
- {"run_command10_key", "core", FALSE,
+ {"run_command10_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_11", OptionKey},
- {"run_command11_key", "core", FALSE,
+ {"run_command11_key", "commands", FALSE,
METACITY "/global_keybindings/run_command_12", OptionKey},
{"rotate_to_1_key", "rotate", FALSE,
@@ -351,11 +351,11 @@
{"rotate_right_window_key", "rotate", FALSE,
METACITY "/window_keybindings/move_to_workspace_right", OptionKey},
- {"command_screenshot", "core", FALSE,
+ {"command_screenshot", "gnomecompat", FALSE,
METACITY "/keybinding_commands/command_screenshot", OptionString},
- {"command_window_screenshot", "core", FALSE,
+ {"command_window_screenshot", "gnomecompat", FALSE,
METACITY "/keybinding_commands/command_window_screenshot", OptionString},
- {"command_terminal", "core", FALSE,
+ {"command_terminal", "gnomecompat", FALSE,
"/desktop/gnome/applications/terminal/exec", OptionString},
{"current_viewport", "thumbnail", TRUE,
@@ -406,19 +406,35 @@
for (i = 0; i < N_SOPTIONS; i++)
{
- if ((strcmp (setting->name, specialOptions[i].settingName) == 0) &&
- ((!setting->parent->name && !specialOptions[i].pluginName) ||
- (setting->parent->name && specialOptions[i].pluginName &&
- (strcmp (setting->parent->name,
- specialOptions[i].pluginName) == 0))) &&
- ((setting->isScreen && specialOptions[i].screen) ||
- (!setting->isScreen && !specialOptions[i].screen)))
- {
- if (index)
- *index = i;
- return TRUE;
+ const SpecialOption *opt = &specialOptions[i];
+
+ if (strcmp (setting->name, opt->settingName) != 0)
+ continue;
+
+ if (setting->parent->name)
+ {
+ if (!opt->pluginName)
+ continue;
+ if (strcmp (setting->parent->name, opt->pluginName) != 0)
+ continue;
+ }
+ else
+ {
+ if (opt->pluginName)
+ continue;
}
+
+ if (setting->isScreen && !opt->screen)
+ continue;
+ if (!setting->isScreen && opt->screen)
+ continue;
+
+ if (index)
+ *index = i;
+
+ return TRUE;
}
+
return FALSE;
}
@@ -1394,28 +1410,25 @@
g_slist_free (valueList);
}
-static void
+static Bool
setGnomeMouseButtonModifier (unsigned int modMask)
{
char *modifiers, *currentValue;
GError *err = NULL;
modifiers = ccsModifiersToString (modMask);
-
- if (!modifiers)
- modifiers = strdup ("");
if (!modifiers)
- return;
+ return FALSE;
- currentValue =
- gconf_client_get_string(client,
- METACITY "/general/mouse_button_modifier",
- &err);
+ currentValue = gconf_client_get_string (client,
+ METACITY
+ "/general/mouse_button_modifier",
+ &err);
if (err)
{
free (modifiers);
g_error_free (err);
- return;
+ return FALSE;
}
if (!currentValue || (strcmp (currentValue, modifiers) != 0))
@@ -1426,6 +1439,8 @@
g_free (currentValue);
free (modifiers);
+
+ return TRUE;
}
static void
@@ -1598,13 +1613,16 @@
unsigned int modMask;
modMask = setting->value->value.asButton.buttonModMask;
- setGnomeMouseButtonModifier (modMask);
- setButtonBindingForSetting (context, "move",
- "initiate_button", 1, modMask);
- setButtonBindingForSetting (context, "resize",
- "initiate_button", 2, modMask);
- setButtonBindingForSetting (context, "core",
- "window_menu_button", 3, modMask);
+ if (setGnomeMouseButtonModifier (modMask))
+ {
+ setButtonBindingForSetting (context, "move",
+ "initiate_button", 1, modMask);
+ setButtonBindingForSetting (context, "resize",
+ "initiate_button", 2, modMask);
+ setButtonBindingForSetting (context, "core",
+ "window_menu_button",
+ 3, modMask);
+ }
}
}
break;
@@ -1816,17 +1834,20 @@
else
currentProfile = strdup (profile);
- if (strcmp (lastProfile, currentProfile) != 0)
+ if (!lastProfile || strcmp (lastProfile, currentProfile) != 0)
{
char *pathName;
- /* copy /apps/compiz tree to profile path */
- asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
- if (pathName)
- {
- copyGconfTree (context, COMPIZ, pathName,
- TRUE, "/schemas" COMPIZ);
- free (pathName);
+ if (lastProfile)
+ {
+ /* copy /apps/compiz tree to profile path */
+ asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
+ if (pathName)
+ {
+ copyGconfTree (context, COMPIZ, pathName,
+ TRUE, "/schemas" COMPIZ);
+ free (pathName);
+ }
}
/* reset /apps/compiz tree */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compizconfig-backend-gconf-0.7.8/VERSION new/compizconfig-backend-gconf-0.8.4/VERSION
--- old/compizconfig-backend-gconf-0.7.8/VERSION 2008-09-17 21:28:03.000000000 +0200
+++ new/compizconfig-backend-gconf-0.8.4/VERSION 2009-10-14 02:45:56.000000000 +0200
@@ -1 +1 @@
-VERSION=0.7.8
+VERSION=0.8.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org