r19449 - in /packages/experimental/gedit-plugins/debian: changelog patches/ patches/20_drawspaces.patch rules
lethalman-guest at users.alioth.debian.org
lethalman-guest at users.alioth.debian.org
Thu Apr 9 10:40:38 UTC 2009
Author: lethalman-guest
Date: Thu Apr 9 10:40:38 2009
New Revision: 19449
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19449
Log:
* debian/patches/20_drawspaces.patch:
- Added, both activates the plugin by default and fixes a crasher
while configuring the plugin.
Added:
packages/experimental/gedit-plugins/debian/patches/
packages/experimental/gedit-plugins/debian/patches/20_drawspaces.patch
Modified:
packages/experimental/gedit-plugins/debian/changelog
packages/experimental/gedit-plugins/debian/rules
Modified: packages/experimental/gedit-plugins/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gedit-plugins/debian/changelog?rev=19449&op=diff
==============================================================================
--- packages/experimental/gedit-plugins/debian/changelog (original)
+++ packages/experimental/gedit-plugins/debian/changelog Thu Apr 9 10:40:38 2009
@@ -19,8 +19,9 @@
+ Bump python-gtk2 to 2.12.0.
+ Bump python-gtksourceview2 to 2.2.0.
+ Bump python-vte to 0.19.4.
- * debian/rules:
- - Remove simple-patchsys and debian/patches/.
+ * debian/patches/20_drawspaces.patch:
+ - Added, both activates the plugin by default and fixes a crasher
+ while configuring the plugin.
-- Luca Bruno <lethalman88 at gmail.com> Tue, 07 Apr 2009 18:34:15 +0200
Added: packages/experimental/gedit-plugins/debian/patches/20_drawspaces.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gedit-plugins/debian/patches/20_drawspaces.patch?rev=19449&op=file
==============================================================================
--- packages/experimental/gedit-plugins/debian/patches/20_drawspaces.patch (added)
+++ packages/experimental/gedit-plugins/debian/patches/20_drawspaces.patch Thu Apr 9 10:40:38 2009
@@ -1,0 +1,76 @@
+--- trunk/plugins/drawspaces/gedit-drawspaces-plugin.c 2009/03/16 11:41:56 446
++++ trunk/plugins/drawspaces/gedit-drawspaces-plugin.c 2009/03/31 18:28:42 457
+@@ -53,6 +53,7 @@
+ struct _GeditDrawspacesPluginPrivate
+ {
+ GConfClient *gconf_client;
++ guint connection_id;
+
+ GtkSourceDrawSpacesFlags flags;
+ };
+@@ -170,24 +171,37 @@
+ GCONF_CLIENT_PRELOAD_ONELEVEL,
+ NULL);
+
+- gconf_client_notify_add (plugin->priv->gconf_client,
+- GCONF_KEY_BASE,
+- on_gconf_notify,
+- plugin, NULL, NULL);
++ plugin->priv->connection_id = gconf_client_notify_add (plugin->priv->gconf_client,
++ GCONF_KEY_BASE,
++ on_gconf_notify,
++ plugin, NULL, NULL);
+ }
+
+ static void
+-gedit_drawspaces_plugin_finalize (GObject *object)
++gedit_drawspaces_plugin_dispose (GObject *object)
+ {
+ GeditDrawspacesPlugin *plugin = GEDIT_DRAWSPACES_PLUGIN (object);
+
+- gedit_debug_message (DEBUG_PLUGINS, "GeditDrawspacesPlugin finalizing");
++ gedit_debug_message (DEBUG_PLUGINS, "GeditDrawspacesPlugin disposing");
+
+- gconf_client_suggest_sync (plugin->priv->gconf_client, NULL);
+-
+- g_object_unref (G_OBJECT (plugin->priv->gconf_client));
++ if (plugin->priv->connection_id != 0)
++ {
++ gconf_client_notify_remove (plugin->priv->gconf_client,
++ plugin->priv->connection_id);
++
++ plugin->priv->connection_id = 0;
++ }
++
++ if (plugin->priv->gconf_client != NULL)
++ {
++ gconf_client_suggest_sync (plugin->priv->gconf_client, NULL);
+
+- G_OBJECT_CLASS (gedit_drawspaces_plugin_parent_class)->finalize (object);
++ g_object_unref (G_OBJECT (plugin->priv->gconf_client));
++
++ plugin->priv->gconf_client = NULL;
++ }
++
++ G_OBJECT_CLASS (gedit_drawspaces_plugin_parent_class)->dispose (object);
+ }
+
+ static void
+@@ -274,7 +288,7 @@
+ gboolean tabs, spaces, newline, nbsp;
+
+ data->enable = get_gconf_value_with_default (plugin, GCONF_KEY_ENABLE,
+- FALSE);
++ TRUE);
+
+ tabs = get_gconf_value_with_default (plugin, GCONF_KEY_DRAW_TABS,
+ TRUE);
+@@ -630,7 +644,7 @@
+
+ g_type_class_add_private (object_class, sizeof (GeditDrawspacesPluginPrivate));
+
+- object_class->finalize = gedit_drawspaces_plugin_finalize;
++ object_class->dispose = gedit_drawspaces_plugin_dispose;
+
+ plugin_class->activate = impl_activate;
+ plugin_class->deactivate = impl_deactivate;
Modified: packages/experimental/gedit-plugins/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gedit-plugins/debian/rules?rev=19449&op=diff
==============================================================================
--- packages/experimental/gedit-plugins/debian/rules (original)
+++ packages/experimental/gedit-plugins/debian/rules Thu Apr 9 10:40:38 2009
@@ -2,6 +2,7 @@
DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
More information about the pkg-gnome-commits
mailing list