r42451 - in /desktop/unstable/gnome-panel/debian: changelog control control.in patches/fix_crash_on_adding.patch patches/series
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Wed Sep 3 15:03:39 UTC 2014
Author: mitya57-guest
Date: Wed Sep 3 15:03:39 2014
New Revision: 42451
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42451
Log:
Fix crash when in-process applet is removed from panel and then added back to panel.
Added:
desktop/unstable/gnome-panel/debian/patches/fix_crash_on_adding.patch
Modified:
desktop/unstable/gnome-panel/debian/changelog
desktop/unstable/gnome-panel/debian/control
desktop/unstable/gnome-panel/debian/control.in
desktop/unstable/gnome-panel/debian/patches/series
Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=42451&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Wed Sep 3 15:03:39 2014
@@ -1,11 +1,16 @@
gnome-panel (3.8.1-2) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
* Depend on evolution-common, the clock applet crashes when it
cannot find the org.gnome.evolution.calendar gsettings schema.
* Drop 11_compat_options.patch. We no longer need to restore saved
sessions from 2011.
* Drop 14_revert_timedate_change.patch. The old DateTimeMechanism
interface no longer exists in gnome-settings-daemon ≥ 3.3.5.
+
+ [ Alberts Muktupāvels ]
+ * Fix crash when in-process applet is removed from panel and then
+ added back to panel. (LP: #1076830)
-- Dmitry Shachnev <mitya57 at gmail.com> Fri, 29 Aug 2014 13:48:55 +0400
Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=42451&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control [utf-8] Wed Sep 3 15:03:39 2014
@@ -2,12 +2,11 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: gnome-panel
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Dmitry Shachnev <mitya57 at gmail.com>, Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Standards-Version: 3.9.5
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 9),
Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=42451&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control.in [utf-8] Wed Sep 3 15:03:39 2014
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Dmitry Shachnev <mitya57 at gmail.com>, @GNOME_TEAM@
+Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.5
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 9),
Added: desktop/unstable/gnome-panel/debian/patches/fix_crash_on_adding.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/fix_crash_on_adding.patch?rev=42451&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/fix_crash_on_adding.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/fix_crash_on_adding.patch [utf-8] Wed Sep 3 15:03:39 2014
@@ -0,0 +1,53 @@
+Description: fix crash when removing in-process applet and then adding it back
+Origin: https://bugzilla.gnome.org/show_bug.cgi?id=692610#c1
+Last-Update: 2014-09-03
+
+--- a/libpanel-applet/panel-applet-factory.c
++++ b/libpanel-applet/panel-applet-factory.c
+@@ -28,6 +28,10 @@
+ guint n_applets;
+ GType applet_type;
+ GClosure *closure;
++
++ GDBusConnection *connection;
++ gint owner_id;
++ gint registration_id;
+ };
+
+ struct _PanelAppletFactoryClass {
+@@ -44,6 +48,16 @@
+ {
+ PanelAppletFactory *factory = PANEL_APPLET_FACTORY (object);
+
++ if (factory->registration_id) {
++ g_dbus_connection_unregister_object (factory->connection, factory->registration_id);
++ factory->registration_id = 0;
++ }
++
++ if (factory->owner_id) {
++ g_bus_unown_name (factory->owner_id);
++ factory->owner_id = 0;
++ }
++
+ if (factory->factory_id) {
+ g_free (factory->factory_id);
+ factory->factory_id = NULL;
+@@ -218,7 +232,8 @@
+ if (!introspection_data)
+ introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
+ object_path = g_strdup_printf (PANEL_APPLET_FACTORY_OBJECT_PATH, factory->factory_id);
+- g_dbus_connection_register_object (connection,
++ factory->connection = connection;
++ factory->registration_id = g_dbus_connection_register_object (connection,
+ object_path,
+ introspection_data->interfaces[0],
+ &interface_vtable,
+@@ -246,7 +261,7 @@
+ gchar *service_name;
+
+ service_name = g_strdup_printf (PANEL_APPLET_FACTORY_SERVICE_NAME, factory->factory_id);
+- g_bus_own_name (G_BUS_TYPE_SESSION,
++ factory->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+ service_name,
+ G_BUS_NAME_OWNER_FLAGS_NONE,
+ (GBusAcquiredCallback) on_bus_acquired,
Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=42451&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Wed Sep 3 15:03:39 2014
@@ -1,2 +1,3 @@
01_gnome-wm.patch
03_tasklist_orientation.patch
+fix_crash_on_adding.patch
More information about the pkg-gnome-commits
mailing list