libindicate

Merge lp:~indicator-applet-developers/libindicate/ubuntu into lp:~ubuntu-desktop/libindicate/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~indicator-applet-developers/libindicate/ubuntu
Merge into: lp:~ubuntu-desktop/libindicate/ubuntu
Diff against target: 133 lines (+29/-10) (has conflicts)
6 files modified
configure.ac (+3/-3)
debian/changelog (+16/-0)
libindicate/Makefile.am (+2/-1)
libindicate/indicate-enum-types.h.in (+3/-2)
libindicate/server.c (+4/-3)
libindicate/server.h (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~indicator-applet-developers/libindicate/ubuntu
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+18736@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

0.3.1

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 2010-02-04 23:16:17 +0000
3+++ configure.ac 2010-02-06 00:28:12 +0000
4@@ -1,10 +1,10 @@
5
6-AC_INIT(libindicate, 0.3.0, ted@canonical.com)
7+AC_INIT(libindicate, 0.3.1, ted@canonical.com)
8
9 AC_PREREQ(2.53)
10
11 AM_CONFIG_HEADER(config.h)
12-AM_INIT_AUTOMAKE(libindicate, 0.3.0)
13+AM_INIT_AUTOMAKE(libindicate, 0.3.1)
14
15 AM_MAINTAINER_MODE
16 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
17@@ -55,7 +55,7 @@
18 DBUS_REQUIRED_VERSION=0.76
19 GLIB_REQUIRED_VERSION=2.18
20 GIO_REQUIRED_VERSION=2.18
21-DBUSMENU_REQUIRED_VERSION=0.2.0
22+DBUSMENU_REQUIRED_VERSION=0.2.2
23
24 PKG_CHECK_MODULES(LIBINDICATE, glib-2.0 >= $GLIB_REQUIRED_VERSION
25 gio-2.0 >= $GIO_REQUIRED_VERSION
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2010-02-05 00:08:44 +0000
29+++ debian/changelog 2010-02-06 00:28:12 +0000
30@@ -1,9 +1,25 @@
31+<<<<<<< TREE
32 libindicate (0.3.0-0ubuntu1) lucid; urgency=low
33
34 * debian/rules:
35 - update the shlibs
36
37 [ Ted Gould ]
38+=======
39+libindicate (0.3.1-0ubuntu1~ppa1) lucid; urgency=low
40+
41+ * Upstream release 0.3.1
42+ * Fixing the server_display signal
43+ * Reincluding the enum headers
44+ * Fixing pkgconfig file to include dbusmenu-glib
45+ * debian/control: Adding libdbusmenu-glib-dev as a dep
46+ for the -dev package.
47+
48+ -- Ted Gould <ted@ubuntu.com> Fri, 05 Feb 2010 16:25:47 -0800
49+
50+libindicate (0.3.0-0ubuntu1~ppa1) lucid; urgency=low
51+
52+>>>>>>> MERGE-SOURCE
53 * Upstream 0.3.0 release
54 * Fixing build of typelib file
55 * Removing the system bus from a default bus
56
57=== modified file 'libindicate/Makefile.am'
58--- libindicate/Makefile.am 2010-02-04 22:37:39 +0000
59+++ libindicate/Makefile.am 2010-02-06 00:28:12 +0000
60@@ -46,7 +46,8 @@
61 interests.h
62
63 libindicateinclude_HEADERS = \
64- $(indicate_headers)
65+ $(indicate_headers) \
66+ $(glib_enum_h)
67
68 libindicate_la_SOURCES = \
69 $(indicate_headers) \
70
71=== modified file 'libindicate/indicate-enum-types.h.in'
72--- libindicate/indicate-enum-types.h.in 2010-02-03 21:14:27 +0000
73+++ libindicate/indicate-enum-types.h.in 2010-02-06 00:28:12 +0000
74@@ -11,11 +11,12 @@
75 /*** BEGIN file-tail ***/
76
77 G_END_DECLS
78-#endif /* _INDICATE_ENUM_TYPES_H_ */"
79+#endif /* _INDICATE_ENUM_TYPES_H_ */
80+
81 /*** END file-tail ***/
82
83 /*** BEGIN file-production ***/
84-/* enumerations from \"@filename@\" */
85+/* enumerations from "@filename@" */
86
87 /*** END file-production ***/
88
89
90=== modified file 'libindicate/server.c'
91--- libindicate/server.c 2010-02-04 22:41:43 +0000
92+++ libindicate/server.c 2010-02-06 00:28:12 +0000
93@@ -271,6 +271,7 @@
94 /**
95 IndicateServer::server-display:
96 @arg0: The #IndicateServer object
97+ @arg1: Timestamp of the show event
98
99 Emitted when a listener signals that the server itself should be
100 displayed. This signal is caused by a user clicking on the application
101@@ -281,8 +282,8 @@
102 G_SIGNAL_RUN_LAST,
103 G_STRUCT_OFFSET (IndicateServerClass, server_display),
104 NULL, NULL,
105- g_cclosure_marshal_VOID__VOID,
106- G_TYPE_NONE, 0);
107+ g_cclosure_marshal_VOID__UINT,
108+ G_TYPE_NONE, 1, G_TYPE_UINT);
109 /**
110 IndicateServer::interest-added:
111 @arg0: The #IndicateServer object
112@@ -1313,7 +1314,7 @@
113 show_indicator_to_user (IndicateServer * server, guint id, guint timestamp, GError ** error)
114 {
115 if (id == INDICATE_SERVER_INDICATOR_NULL) {
116- g_signal_emit(server, signals[SERVER_DISPLAY], 0, TRUE);
117+ g_signal_emit(server, signals[SERVER_DISPLAY], 0, timestamp, TRUE);
118 return TRUE;
119 }
120
121
122=== modified file 'libindicate/server.h'
123--- libindicate/server.h 2010-02-04 22:41:43 +0000
124+++ libindicate/server.h 2010-02-06 00:28:12 +0000
125@@ -143,7 +143,7 @@
126 void (* indicator_modified) (IndicateServer * server, guint id, gchar * property);
127 void (* server_show) (IndicateServer * server, gchar * type);
128 void (* server_hide) (IndicateServer * server, gchar * type);
129- void (* server_display) (IndicateServer * server);
130+ void (* server_display) (IndicateServer * server, guint timestamp);
131 void (* interest_added) (IndicateServer * server, IndicateInterests interest);
132 void (* interest_removed) (IndicateServer * server, IndicateInterests interest);
133 void (* max_indicators_changed) (IndicateServer * server, gint max);

Subscribers

People subscribed via source and target branches

to all changes: