aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Terry <mike@mterry.name>2011-02-28 08:58:38 -0500
committerMichael Terry <mike@mterry.name>2011-02-28 08:58:38 -0500
commit49874d38804ea6cc47d3a241600e4f0a12f9fc1a (patch)
treebeb80910176c797b9d5435688670654b9cd48156
parent5f97e91d0017b93369d3ddc7e7354a8f285bf336 (diff)
downloadlibayatana-appindicator-49874d38804ea6cc47d3a241600e4f0a12f9fc1a.tar.gz
libayatana-appindicator-49874d38804ea6cc47d3a241600e4f0a12f9fc1a.tar.bz2
libayatana-appindicator-49874d38804ea6cc47d3a241600e4f0a12f9fc1a.zip
* debian/control, debian/rules:0.2.96-0ubuntu2
- Add quilt * debian/patches/disconnect-from-theme.patch: - Fix crash when switching themes by disconnecting a signal from the theme on dispose. LP: #708188
-rw-r--r--debian/changelog10
-rw-r--r--debian/control1
-rw-r--r--debian/patches/disconnect-from-theme.patch14
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules1
-rw-r--r--src/app-indicator.c2
6 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 920b151..3ae4dd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libappindicator (0.2.96-0ubuntu2) natty; urgency=low
+
+ * debian/control, debian/rules:
+ - Add quilt
+ * debian/patches/disconnect-from-theme.patch:
+ - Fix crash when switching themes by disconnecting a signal from
+ the theme on dispose. LP: #708188
+
+ -- Michael Terry <mterry@ubuntu.com> Mon, 28 Feb 2011 08:48:40 -0500
+
libappindicator (0.2.96-0ubuntu1) natty; urgency=low
[ Ted Gould ]
diff --git a/debian/control b/debian/control
index 4f608a9..acf6057 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ XS-Python-Version: all
Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
Build-Depends: debhelper (>= 7.0),
cdbs (>= 0.4.41),
+ quilt,
libgtk2.0-dev (>= 2.12.0),
libgtk-3-dev (>= 2.91.3),
libdbus-glib-1-dev (>= 0.82),
diff --git a/debian/patches/disconnect-from-theme.patch b/debian/patches/disconnect-from-theme.patch
new file mode 100644
index 0000000..a60502c
--- /dev/null
+++ b/debian/patches/disconnect-from-theme.patch
@@ -0,0 +1,14 @@
+=== modified file 'src/app-indicator.c'
+Index: libappindicator.ubu/src/app-indicator.c
+===================================================================
+--- libappindicator.ubu.orig/src/app-indicator.c 2011-02-28 08:35:28.963390000 -0500
++++ libappindicator.ubu/src/app-indicator.c 2011-02-28 08:46:54.147065973 -0500
+@@ -667,6 +667,8 @@
+ priv->connection = NULL;
+ }
+
++ g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), self);
++
+ G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object);
+ return;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d94f0d1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disconnect-from-theme.patch
diff --git a/debian/rules b/debian/rules
index 3f266b0..a149c98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ export CSC=/usr/bin/mono-csc
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
API_VERSION = 0.1
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 167e17f..01fdd5a 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -667,6 +667,8 @@ app_indicator_dispose (GObject *object)
priv->connection = NULL;
}
+ g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), self);
+
G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object);
return;
}