[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3993 - in branches/experimental/app/compiz: debian plugins



Author: beatle
Date: 2006-11-13 20:41:43 -0500 (Mon, 13 Nov 2006)
New Revision: 3993

Removed:
   branches/experimental/app/compiz/debian/gtk-window-decorator.schemas
   branches/experimental/app/compiz/plugins/gconf-compiz-utils.c
   branches/experimental/app/compiz/plugins/gconf-compiz-utils.h
Modified:
   branches/experimental/app/compiz/debian/changelog
   branches/experimental/app/compiz/debian/compiz-gtk.install
   branches/experimental/app/compiz/debian/rules
Log:
Add bug closer for new upstream release.

Replace the gtk-window-decorator schemas file by the one provided by
upstream (gtk/window-decorator/gwd.schemas).

Remove files that are not shipped in the upstream tarball any longer.


Modified: branches/experimental/app/compiz/debian/changelog
===================================================================
--- branches/experimental/app/compiz/debian/changelog	2006-11-14 01:29:44 UTC (rev 3992)
+++ branches/experimental/app/compiz/debian/changelog	2006-11-14 01:41:43 UTC (rev 3993)
@@ -1,11 +1,13 @@
 compiz (0.3.2-1) experimental; urgency=low
 
-  * New upstream release.
+  * New upstream release. Closes: #396770.
     + Remove 010_snap-inverted.patch, applied upstream.
     + Refreshed other patches to apply cleanly again.
+    + Remove gtk-window-decorator.schemas and use the one provided by
+      upstream (gtk/window-decorator/gwd.schemas).
   * Targetted at experimental until the release of etch.
 
- -- Thierry Reding <thierry@gilfi.de>  Tue, 14 Nov 2006 02:28:30 +0100
+ -- Thierry Reding <thierry@gilfi.de>  Tue, 14 Nov 2006 02:36:40 +0100
 
 compiz (0.2.2-1) unstable; urgency=low
 

Modified: branches/experimental/app/compiz/debian/compiz-gtk.install
===================================================================
--- branches/experimental/app/compiz/debian/compiz-gtk.install	2006-11-14 01:29:44 UTC (rev 3992)
+++ branches/experimental/app/compiz/debian/compiz-gtk.install	2006-11-14 01:41:43 UTC (rev 3993)
@@ -1,2 +1,2 @@
-usr/share/gconf/schemas/gtk-window-decorator.schemas
+usr/share/gconf/schemas/gwd.schemas
 usr/bin/gtk-window-decorator

Deleted: branches/experimental/app/compiz/debian/gtk-window-decorator.schemas
===================================================================
--- branches/experimental/app/compiz/debian/gtk-window-decorator.schemas	2006-11-14 01:29:44 UTC (rev 3992)
+++ branches/experimental/app/compiz/debian/gtk-window-decorator.schemas	2006-11-14 01:41:43 UTC (rev 3993)
@@ -1,15 +0,0 @@
-<gconfschemafile>
-	<schemalist>
-		<schema>
-			<key>/schemas/apps/gwd/use_metacity_theme</key>
-			<applyto>/apps/gwd/use_metacity_theme</applyto>
-			<type>bool</type>
-			<default>true</default>
-			<locale name="C">
-				<short>Use Metacity theme.</short>
-				<long>Use the current Metacity theme.</long>
-			</locale>
-		</schema>
-	</schemalist>
-</gconfschemafile>
-

Modified: branches/experimental/app/compiz/debian/rules
===================================================================
--- branches/experimental/app/compiz/debian/rules	2006-11-14 01:29:44 UTC (rev 3992)
+++ branches/experimental/app/compiz/debian/rules	2006-11-14 01:41:43 UTC (rev 3993)
@@ -85,10 +85,6 @@
 	# remove unneeded .la files
 	find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.la' | xargs rm -f
 
-	# install schemas file for the Gtk window decorator
-	$(INSTALL) --mode 0644 $(CURDIR)/debian/gtk-window-decorator.schemas \
-	                       $(CURDIR)/debian/tmp/usr/share/gconf/schemas
-
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir

Deleted: branches/experimental/app/compiz/plugins/gconf-compiz-utils.c
===================================================================
--- branches/experimental/app/compiz/plugins/gconf-compiz-utils.c	2006-11-14 01:29:44 UTC (rev 3992)
+++ branches/experimental/app/compiz/plugins/gconf-compiz-utils.c	2006-11-14 01:41:43 UTC (rev 3993)
@@ -1,234 +0,0 @@
-/*
- * Copyright © 2006 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define _GNU_SOURCE
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <compiz.h>
-
-#include <glib.h>
-#include <gconf/gconf-client.h>
-#include <gconf-compiz-utils.h>
-
-struct _GConfModifier {
-    char *name;
-    int  modifier;
-} modifiers[] = {
-    { "<Shift>",      ShiftMask		 },
-    { "<Control>",    ControlMask	 },
-    { "<Mod1>",	      Mod1Mask		 },
-    { "<Mod2>",	      Mod2Mask		 },
-    { "<Mod3>",	      Mod3Mask		 },
-    { "<Mod4>",	      Mod4Mask		 },
-    { "<Mod5>",	      Mod5Mask		 },
-    { "<Alt>",	      CompAltMask        },
-    { "<Meta>",	      CompMetaMask       },
-    { "<Super>",      CompSuperMask      },
-    { "<Hyper>",      CompHyperMask	 },
-    { "<ModeSwitch>", CompModeSwitchMask },
-};
-
-#define N_MODIFIERS (sizeof (modifiers) / sizeof (struct _GConfModifier))
-
-static gchar *edgeName[] = {
-    N_("Left"),
-    N_("Right"),
-    N_("Top"),
-    N_("Bottom"),
-    N_("TopLeft"),
-    N_("TopRight"),
-    N_("BottomLeft"),
-    N_("BottomRight")
-};
-
-static GString *
-gconfModifiersToString (CompDisplay *d,
-			guint	    modMask)
-{
-    GString *binding;
-    gint    i;
-
-    binding = g_string_new (NULL);
-    for (i = 0; i < N_MODIFIERS; i++)
-    {
-	if (modMask & modifiers[i].modifier)
-	    g_string_append (binding, modifiers[i].name);
-    }
-
-    return binding;
-}
-
-char *
-gconfKeyBindingToString (CompDisplay    *d,
-			 CompKeyBinding *key)
-{
-    GString *binding;
-
-    binding = gconfModifiersToString (d, key->modifiers);
-
-    if (key->keycode != 0)
-    {
-	KeySym keysym;
-	gchar  *keyname;
-
-	keysym  = XKeycodeToKeysym (d->display, key->keycode, 0);
-	keyname = XKeysymToString (keysym);
-
-	if (keyname)
-	    g_string_append (binding, keyname);
-	else
-	    g_string_append_printf (binding, "0x%x", key->keycode);
-    }
-
-    return g_string_free (binding, FALSE);
-}
-
-char *
-gconfButtonBindingToString (CompDisplay       *d,
-			    CompButtonBinding *button)
-{
-    GString *binding;
-
-    binding = gconfModifiersToString (d, button->modifiers);
-
-    g_string_append_printf (binding, "Button%d", button->button);
-
-    return g_string_free (binding, FALSE);
-}
-
-static guint
-gconfStringToModifiers (CompDisplay *d,
-			const char  *binding)
-{
-    guint mods = 0;
-    gint  i;
-
-    for (i = 0; i < N_MODIFIERS; i++)
-    {
-	if (strcasestr (binding, modifiers[i].name))
-	    mods |= modifiers[i].modifier;
-    }
-
-    return mods;
-}
-
-int
-gconfStringToKeyBinding (CompDisplay    *d,
-			 const char     *binding,
-			 CompKeyBinding *key)
-{
-    gchar  *ptr;
-    guint  mods;
-    KeySym keysym;
-
-    mods = gconfStringToModifiers (d, binding);
-
-    ptr = strrchr (binding, '>');
-    if (ptr)
-	binding = ptr + 1;
-
-    while (*binding && !isalnum (*binding))
-	binding++;
-
-    keysym = XStringToKeysym (binding);
-    if (keysym != NoSymbol)
-    {
-	KeyCode keycode;
-
-	keycode = XKeysymToKeycode (d->display, keysym);
-	if (keycode)
-	{
-	    key->keycode   = keycode;
-	    key->modifiers = mods;
-
-	    return TRUE;
-	}
-    }
-
-    if (strncmp (binding, "0x", 2) == 0)
-    {
-	key->keycode   = strtol (binding, NULL, 0);
-	key->modifiers = mods;
-
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
-int
-gconfStringToButtonBinding (CompDisplay	      *d,
-			    const char	      *binding,
-			    CompButtonBinding *button)
-{
-    gchar *ptr;
-    guint mods;
-
-    mods = gconfStringToModifiers (d, binding);
-
-    ptr = strrchr (binding, '>');
-    if (ptr)
-	binding = ptr + 1;
-
-    while (*binding && !isalnum (*binding))
-	binding++;
-
-    ptr = (gchar *) binding;
-    if (strcmpskipifequal (&ptr, "Button") == 0)
-    {
-	gint buttonNum;
-
-	if (sscanf (ptr, "%d", &buttonNum) == 1)
-	{
-	    button->button    = buttonNum;
-	    button->modifiers = mods;
-
-	    return TRUE;
-	}
-    }
-
-    return FALSE;
-}
-
-int
-strcmpskipifequal (char **ptr,
-		   char *s)
-{
-    int ret, len;
-
-    len = strlen (s);
-    ret = strncmp (*ptr, s, len);
-    if (ret == 0)
-	*ptr = (*ptr) + len;
-
-    return ret;
-}
-
-gchar *
-gconfEdgeToString (guint edge)
-{
-    return edgeName[edge];
-}

Deleted: branches/experimental/app/compiz/plugins/gconf-compiz-utils.h
===================================================================
--- branches/experimental/app/compiz/plugins/gconf-compiz-utils.h	2006-11-14 01:29:44 UTC (rev 3992)
+++ branches/experimental/app/compiz/plugins/gconf-compiz-utils.h	2006-11-14 01:41:43 UTC (rev 3993)
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2006 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define APP_NAME "/apps/compiz"
-
-char *
-gconfBindingToString (CompDisplay     *display,
-		      CompOptionValue *value);
-
-char *
-gconfKeyBindingToString (CompDisplay    *d,
-			 CompKeyBinding *key);
-
-char *
-gconfButtonBindingToString (CompDisplay       *d,
-			    CompButtonBinding *button);
-
-int
-gconfStringToBinding (CompDisplay     *display,
-		      const char      *binding,
-		      CompOptionValue *value);
-
-int
-gconfStringToKeyBinding (CompDisplay    *d,
-			 const char     *binding,
-			 CompKeyBinding *key);
-
-int
-gconfStringToButtonBinding (CompDisplay	      *d,
-			    const char	      *binding,
-			    CompButtonBinding *button);
-
-int
-strcmpskipifequal (char **ptr,
-		   char *s);
-
-char *
-gconfKeyForOption (CompOption *o,
-		   const char *screen,
-		   const char *plugin);
-
-gboolean
-gconfOptionForKey (CompDisplay *d,
-		   char        *key,
-		   CompScreen  **s,
-		   char        **plugin,
-		   CompOption  **o);
-
-gchar *
-gconfEdgeToString (guint edge);



Reply to: