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

Proposed by Ted Gould on 2011-10-13
Status: Merged
Merged at revision: 167
Proposed branch: lp:~indicator-applet-developers/indicator-session/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-session/ubuntu
Diff against target: 201 lines (+75/-13)
7 files modified
ChangeLog (+44/-0)
configure (+1/-1)
configure.ac (+1/-1)
debian/changelog (+9/-0)
src/apt-transaction.c (+0/-1)
src/apt-watcher.c (+2/-1)
src/settings-helper.c (+18/-9)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-session/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine 2011-10-13 Pending
Review via email: mp+79325@code.launchpad.net

Description of the change

Some fixes.

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 'ChangeLog'
2--- ChangeLog 2011-09-27 21:56:12 +0000
3+++ ChangeLog 2011-10-13 18:23:36 +0000
4@@ -1,5 +1,49 @@
5 # Generated by Makefile. Do not edit.
6
7+2011-10-13 Ted Gould <ted@gould.cx>
8+
9+ 0.3.7
10+
11+2011-10-12 Ted Gould <ted@gould.cx>
12+
13+ Fix variant handling
14+
15+2011-10-09 Ted Gould <ted@gould.cx>
16+
17+ Attach bug
18+
19+2011-10-09 Ted Gould <ted@gould.cx>
20+
21+ Don't unref the parameters as we don't make a ref to it
22+
23+2011-10-09 Ted Gould <ted@gould.cx>
24+
25+ Make sure to reference the variant, and unref the value we get
26+
27+2011-10-12 Ted Gould <ted@gould.cx>
28+
29+ Check to ensure we have settings, else default values.
30+
31+2011-10-12 Ted Gould <ted@gould.cx>
32+
33+ Okay, get all of them I guess
34+
35+2011-10-10 Ted Gould <ted@gould.cx>
36+
37+ Use a temporary variable to defeat G_DISABLE_CHECKS
38+
39+2011-10-08 Ted Gould <ted@gould.cx>
40+
41+ Error gracefully if we can't get our settings.
42+
43+2011-10-12 Ted Gould <ted@gould.cx>
44+
45+ Okay, fixing again. Now right.
46+
47+2011-10-03 Ken VanDine <ken.vandine@canonical.com>
48+
49+ Fixed improperly mapped gconf to gsettings keys, fixes crasher (LP: #858798)
50+
51 2011-09-27 Ted Gould <ted@gould.cx>
52
53 0.3.6
54
55=== modified file 'configure'
56--- configure 2011-09-27 21:56:12 +0000
57+++ configure 2011-10-13 18:23:36 +0000
58@@ -2745,7 +2745,7 @@
59
60 # Define the identity of the package.
61 PACKAGE=indicator-session
62- VERSION=0.3.6
63+ VERSION=0.3.7
64
65
66 cat >>confdefs.h <<_ACEOF
67
68=== modified file 'configure.ac'
69--- configure.ac 2011-09-27 22:05:28 +0000
70+++ configure.ac 2011-10-13 18:23:36 +0000
71@@ -4,7 +4,7 @@
72 AC_PREREQ(2.53)
73
74 AM_CONFIG_HEADER(config.h)
75-AM_INIT_AUTOMAKE(indicator-session, 0.3.6)
76+AM_INIT_AUTOMAKE(indicator-session, 0.3.7)
77
78 AM_MAINTAINER_MODE
79
80
81=== modified file 'debian/changelog'
82--- debian/changelog 2011-10-03 14:29:47 +0000
83+++ debian/changelog 2011-10-13 18:23:36 +0000
84@@ -1,3 +1,12 @@
85+indicator-session (0.3.7-0ubuntu1~ppa1) oneiric; urgency=low
86+
87+ * New upstream release.
88+ * Fix some variant ref issues causing crashes (LP: #863930)
89+ * Handle cases of returned dbus messages from ConsoleKit (LP: #864085)
90+ * Fixed improperly mapped gconf to gsettings keys (LP: #858798)
91+
92+ -- Ted Gould <ted@ubuntu.com> Thu, 13 Oct 2011 13:19:13 -0500
93+
94 indicator-session (0.3.6-0ubuntu2) oneiric; urgency=low
95
96 * data/indicator-session.convert
97
98=== modified file 'src/apt-transaction.c'
99--- src/apt-transaction.c 2011-09-07 11:04:16 +0000
100+++ src/apt-transaction.c 2011-10-13 18:23:36 +0000
101@@ -232,7 +232,6 @@
102 0,
103 current_state);
104 }
105- g_variant_unref (parameters);
106 }
107
108 static void
109
110=== modified file 'src/apt-watcher.c'
111--- src/apt-watcher.c 2011-09-19 20:47:59 +0000
112+++ src/apt-watcher.c 2011-10-13 18:23:36 +0000
113@@ -425,7 +425,7 @@
114 g_return_if_fail (APT_IS_WATCHER (user_data));
115 AptWatcher* self = APT_WATCHER (user_data);
116
117- g_variant_ref (parameters);
118+ g_variant_ref_sink (parameters);
119 GVariant *value = g_variant_get_child_value (parameters, 0);
120
121 if (g_strcmp0(signal_name, "ActiveTransactionsChanged") == 0){
122@@ -477,6 +477,7 @@
123 }
124 }
125
126+ g_variant_unref (value);
127 g_variant_unref (parameters);
128 }
129
130
131=== modified file 'src/settings-helper.c'
132--- src/settings-helper.c 2011-09-06 15:52:08 +0000
133+++ src/settings-helper.c 2011-10-13 18:23:36 +0000
134@@ -38,41 +38,49 @@
135 static guint restart_notify = 0;
136 static guint shutdown_notify = 0;
137
138-static void
139+static gboolean
140 build_settings (void) {
141- if(!settings) {
142+ if (settings == NULL) {
143 settings = g_settings_new (SESSION_SCHEMA);
144 }
145- return;
146+ if (settings == NULL) {
147+ return FALSE;
148+ }
149+ return TRUE;
150 }
151
152 gboolean
153 supress_confirmations (void) {
154- build_settings();
155+ gboolean settings_built = build_settings();
156+ g_return_val_if_fail(settings_built, FALSE);
157 return g_settings_get_boolean (settings, SUPPRESS_KEY) ;
158 }
159
160 gboolean
161 should_show_user_menu (void) {
162- build_settings();
163+ gboolean settings_built = build_settings();
164+ g_return_val_if_fail(settings_built, TRUE);
165 return g_settings_get_boolean (settings, SHOW_USER_MENU) ;
166 }
167
168 gboolean
169 show_logout (void) {
170- build_settings();
171+ gboolean settings_built = build_settings();
172+ g_return_val_if_fail(settings_built, TRUE);
173 return !g_settings_get_boolean (settings, LOGOUT_KEY) ;
174 }
175
176 gboolean
177 show_restart (void) {
178- build_settings();
179+ gboolean settings_built = build_settings();
180+ g_return_val_if_fail(settings_built, TRUE);
181 return !g_settings_get_boolean (settings, RESTART_KEY) ;
182 }
183
184 gboolean
185 show_shutdown (void) {
186- build_settings();
187+ gboolean settings_built = build_settings();
188+ g_return_val_if_fail(settings_built, TRUE);
189 return !g_settings_get_boolean (settings, SHUTDOWN_KEY) ;
190 }
191
192@@ -122,7 +130,8 @@
193 void
194 update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) {
195 /* If we don't have a client, build one. */
196- build_settings();
197+ gboolean settings_built = build_settings();
198+ g_return_if_fail(settings_built);
199
200 if (confirmation_notify != 0) {
201 g_signal_handler_disconnect (settings, confirmation_notify);

Subscribers

People subscribed via source and target branches

to all changes: