Indicator Applet

Merge lp:~indicator-applet-developers/indicator-applet/messages-packaging into lp:~ubuntu-core-dev/indicator-applet/messages-ubuntu

  1. messages-packaging
  2. Merge into messages-ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~indicator-applet-developers/indicator-applet/messages-packaging
Merge into: lp:~ubuntu-core-dev/indicator-applet/messages-ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-applet/messages-packaging
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+5488@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2009-04-08 03:09:41 +0000
3+++ configure.ac 2009-04-13 15:57:24 +0000
4@@ -4,7 +4,7 @@
5 AC_PREREQ(2.53)
6
7 AM_CONFIG_HEADER(config.h)
8-AM_INIT_AUTOMAKE(indicator-messages, 0.1.5)
9+AM_INIT_AUTOMAKE(indicator-messages, 0.1.6)
10
11 AM_MAINTAINER_MODE
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2009-04-08 09:04:48 +0000
16+++ debian/changelog 2009-04-13 16:25:42 +0000
17@@ -1,3 +1,11 @@
18+indicator-messages (0.1.6-0ubuntu1) UNRELEASED; urgency=low
19+
20+ * New upstream version
21+ * Patch from Cody Russell to fix LP: #359018 by correctly implementing
22+ the finalize functions.
23+
24+ -- Ted Gould <ted@ubuntu.com> Mon, 13 Apr 2009 11:24:43 -0500
25+
26 indicator-messages (0.1.5-0ubuntu1) jaunty; urgency=low
27
28 * New upstream version
29
30=== modified file 'src/app-menu-item.c'
31--- src/app-menu-item.c 2009-04-03 20:25:52 +0000
32+++ src/app-menu-item.c 2009-04-13 15:02:06 +0000
33@@ -125,14 +125,14 @@
34 static void
35 app_menu_item_finalize (GObject *object)
36 {
37- G_OBJECT_CLASS (app_menu_item_parent_class)->finalize (object);
38-
39 AppMenuItem * self = APP_MENU_ITEM(object);
40 AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self);
41
42 g_signal_handlers_disconnect_by_func(G_OBJECT(priv->listener), G_CALLBACK(indicator_added_cb), self);
43 g_signal_handlers_disconnect_by_func(G_OBJECT(priv->listener), G_CALLBACK(indicator_removed_cb), self);
44
45+ G_OBJECT_CLASS (app_menu_item_parent_class)->finalize (object);
46+
47 return;
48 }
49

Subscribers

People subscribed via source and target branches