Unity Control Center

Merge lp:~robert-ancell/unity-control-center/misc-warnings into lp:unity-control-center

  1. misc-warnings
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 12708
Merged at revision: 12708
Proposed branch: lp:~robert-ancell/unity-control-center/misc-warnings
Merge into: lp:unity-control-center
Diff against target: 302 lines (+31/-23)
15 files modified
panels/common/list-languages.c (+0/-2)
panels/info/cc-info-panel.c (+2/-2)
panels/network/net-device-wifi.c (+3/-3)
panels/printers/pp-ppd-option-widget.c (+2/-2)
panels/region/gnome-region-panel-input.c (+2/-2)
panels/screen/cc-screen-panel.c (+2/-0)
panels/sound/gvc-balance-bar.c (+5/-3)
panels/sound/gvc-channel-bar.c (+2/-1)
panels/sound/gvc-combo-box.c (+2/-1)
panels/sound/gvc-mixer-dialog.c (+2/-1)
panels/sound/gvc-sound-theme-chooser.c (+2/-1)
panels/user-accounts/um-utils.c (+1/-1)
panels/wacom/calibrator/gui_gtk.c (+2/-2)
panels/wacom/gsd-wacom-device.c (+3/-1)
shell/cc-shell-model.c (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/unity-control-center/misc-warnings
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+206846@code.launchpad.net

Commit message

Fix various compile warnings

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:12708
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/20/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

cleaner indeed ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/common/list-languages.c'
2--- panels/common/list-languages.c 2012-10-01 07:32:18 +0000
3+++ panels/common/list-languages.c 2014-02-18 04:28:49 +0000
4@@ -14,8 +14,6 @@
5 setlocale (LC_ALL, NULL);
6 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
7
8- g_type_init ();
9-
10 if (argc > 1) {
11 guint i;
12 for (i = 1; i < argc; i++) {
13
14=== modified file 'panels/info/cc-info-panel.c'
15--- panels/info/cc-info-panel.c 2013-11-29 06:28:37 +0000
16+++ panels/info/cc-info-panel.c 2014-02-18 04:28:49 +0000
17@@ -951,8 +951,8 @@
18 g_signal_connect (G_OBJECT (webView), "navigation-policy-decision-requested",
19 G_CALLBACK (url_nav_callback), sw);
20
21- gtk_container_add (GTK_CONTAINER (sw), webView);
22- gtk_notebook_append_page (WID ("notebook"), sw, NULL);
23+ gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (webView));
24+ gtk_notebook_append_page (GTK_NOTEBOOK (WID ("notebook")), sw, NULL);
25 gtk_widget_show_all(sw);
26 }
27
28
29=== modified file 'panels/network/net-device-wifi.c'
30--- panels/network/net-device-wifi.c 2013-11-28 06:13:40 +0000
31+++ panels/network/net-device-wifi.c 2014-02-18 04:28:49 +0000
32@@ -140,7 +140,7 @@
33 {
34 const GByteArray *ssid;
35 const gchar *object_path;
36- const gchar *ssid_text;
37+ gchar *ssid_text;
38 gboolean is_active_ap;
39 gchar *title;
40 GtkListStore *liststore_network;
41@@ -520,7 +520,7 @@
42 {
43 const GByteArray *ssid;
44 const gchar *id;
45- const gchar *ssid_text;
46+ gchar *ssid_text;
47 gchar *title;
48 GtkListStore *store;
49 GtkTreeIter iter;
50@@ -1076,7 +1076,7 @@
51 const gchar *ap_object_path)
52 {
53 const GByteArray *ssid;
54- const gchar *ssid_tmp = NULL;
55+ gchar *ssid_tmp = NULL;
56 GSList *list, *l;
57 GSList *filtered;
58 NMConnection *connection_activate = NULL;
59
60=== modified file 'panels/printers/pp-ppd-option-widget.c'
61--- panels/printers/pp-ppd-option-widget.c 2012-09-11 13:02:26 +0000
62+++ panels/printers/pp-ppd-option-widget.c 2014-02-18 04:28:49 +0000
63@@ -58,7 +58,7 @@
64 gboolean ppd_filename_set;
65 };
66
67-G_DEFINE_TYPE (PpPPDOptionWidget, pp_ppd_option_widget, GTK_TYPE_HBOX)
68+G_DEFINE_TYPE (PpPPDOptionWidget, pp_ppd_option_widget, GTK_TYPE_BOX)
69
70 /* This list comes from Gtk+ */
71 static const struct {
72@@ -233,7 +233,7 @@
73
74 if (option && printer_name)
75 {
76- widget = g_object_new (PP_TYPE_PPD_OPTION_WIDGET, NULL);
77+ widget = g_object_new (PP_TYPE_PPD_OPTION_WIDGET, "orientation", GTK_ORIENTATION_HORIZONTAL, NULL);
78
79 priv = PP_PPD_OPTION_WIDGET_GET_PRIVATE (widget);
80
81
82=== modified file 'panels/region/gnome-region-panel-input.c'
83--- panels/region/gnome-region-panel-input.c 2013-11-28 06:08:25 +0000
84+++ panels/region/gnome-region-panel-input.c 2014-02-18 04:28:49 +0000
85@@ -1431,7 +1431,7 @@
86 GVariant *variant,
87 gpointer user_data)
88 {
89- gchar **switch_key;
90+ const gchar **switch_key;
91
92 switch_key = g_variant_get_strv (variant, NULL);
93 g_value_set_string (value, switch_key[0]);
94@@ -1445,7 +1445,7 @@
95 const GVariantType *expected_type,
96 gpointer user_data)
97 {
98- gchar *switch_key;
99+ const gchar *switch_key;
100 gchar **switch_strv;
101 GVariant *ret = NULL;
102
103
104=== modified file 'panels/screen/cc-screen-panel.c'
105--- panels/screen/cc-screen-panel.c 2013-11-28 06:03:56 +0000
106+++ panels/screen/cc-screen-panel.c 2014-02-18 04:28:49 +0000
107@@ -19,6 +19,8 @@
108 *
109 */
110
111+#include <string.h>
112+
113 #include "cc-screen-panel.h"
114
115 CC_PANEL_REGISTER (CcScreenPanel, cc_screen_panel)
116
117=== modified file 'panels/sound/gvc-balance-bar.c'
118--- panels/sound/gvc-balance-bar.c 2013-12-03 03:04:42 +0000
119+++ panels/sound/gvc-balance-bar.c 2014-02-18 04:28:49 +0000
120@@ -76,7 +76,7 @@
121 static void on_adjustment_value_changed (GtkAdjustment *adjustment,
122 GvcBalanceBar *bar);
123
124-G_DEFINE_TYPE (GvcBalanceBar, gvc_balance_bar, GTK_TYPE_HBOX)
125+G_DEFINE_TYPE (GvcBalanceBar, gvc_balance_bar, GTK_TYPE_BOX)
126
127 static GtkWidget *
128 _scale_box_new (GvcBalanceBar *bar)
129@@ -90,7 +90,7 @@
130 gdouble lower, upper;
131
132 bar->priv->scale_box = box = gtk_box_new (FALSE, 6);
133- priv->scale = gtk_hscale_new (priv->adjustment);
134+ priv->scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, priv->adjustment);
135 gtk_widget_set_size_request (priv->scale, SCALE_SIZE, -1);
136 gtk_scale_set_has_origin (GTK_SCALE (priv->scale), FALSE);
137 gtk_widget_set_name (priv->scale, "balance-bar-scale");
138@@ -569,7 +569,9 @@
139 {
140 GObject *bar;
141 bar = g_object_new (GVC_TYPE_BALANCE_BAR,
142- "balance-type", btype, NULL);
143+ "balance-type", btype,
144+ "orientation", GTK_ORIENTATION_HORIZONTAL,
145+ NULL);
146
147 return GTK_WIDGET (bar);
148 }
149
150=== modified file 'panels/sound/gvc-channel-bar.c'
151--- panels/sound/gvc-channel-bar.c 2012-06-25 12:41:31 +0000
152+++ panels/sound/gvc-channel-bar.c 2014-02-18 04:28:49 +0000
153@@ -99,7 +99,7 @@
154 GdkEventScroll *event,
155 GvcChannelBar *bar);
156
157-G_DEFINE_TYPE (GvcChannelBar, gvc_channel_bar, GTK_TYPE_HBOX)
158+G_DEFINE_TYPE (GvcChannelBar, gvc_channel_bar, GTK_TYPE_BOX)
159
160 static GtkWidget *
161 _scale_box_new (GvcChannelBar *bar)
162@@ -969,6 +969,7 @@
163 {
164 GObject *bar;
165 bar = g_object_new (GVC_TYPE_CHANNEL_BAR,
166+ "orientation", GTK_ORIENTATION_HORIZONTAL,
167 NULL);
168 return GTK_WIDGET (bar);
169 }
170
171=== modified file 'panels/sound/gvc-combo-box.c'
172--- panels/sound/gvc-combo-box.c 2012-02-08 12:11:02 +0000
173+++ panels/sound/gvc-combo-box.c 2014-02-18 04:28:49 +0000
174@@ -75,7 +75,7 @@
175 static void gvc_combo_box_init (GvcComboBox *combo_box);
176 static void gvc_combo_box_finalize (GObject *object);
177
178-G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_HBOX)
179+G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_BOX)
180
181 void
182 gvc_combo_box_set_size_group (GvcComboBox *combo_box,
183@@ -392,6 +392,7 @@
184 GObject *combo_box;
185 combo_box = g_object_new (GVC_TYPE_COMBO_BOX,
186 "label", label,
187+ "orientation", GTK_ORIENTATION_HORIZONTAL,
188 NULL);
189 return GTK_WIDGET (combo_box);
190 }
191
192=== modified file 'panels/sound/gvc-mixer-dialog.c'
193--- panels/sound/gvc-mixer-dialog.c 2013-12-03 03:04:42 +0000
194+++ panels/sound/gvc-mixer-dialog.c 2014-02-18 04:28:49 +0000
195@@ -141,7 +141,7 @@
196 guint id,
197 GvcMixerDialog *dialog);
198
199-G_DEFINE_TYPE (GvcMixerDialog, gvc_mixer_dialog, GTK_TYPE_VBOX)
200+G_DEFINE_TYPE (GvcMixerDialog, gvc_mixer_dialog, GTK_TYPE_BOX)
201
202
203 static void
204@@ -2171,6 +2171,7 @@
205 GObject *dialog;
206 dialog = g_object_new (GVC_TYPE_MIXER_DIALOG,
207 "mixer-control", control,
208+ "orientation", GTK_ORIENTATION_VERTICAL,
209 NULL);
210 return GVC_MIXER_DIALOG (dialog);
211 }
212
213=== modified file 'panels/sound/gvc-sound-theme-chooser.c'
214--- panels/sound/gvc-sound-theme-chooser.c 2013-11-28 04:43:22 +0000
215+++ panels/sound/gvc-sound-theme-chooser.c 2014-02-18 04:28:49 +0000
216@@ -54,7 +54,7 @@
217 static void gvc_sound_theme_chooser_init (GvcSoundThemeChooser *sound_theme_chooser);
218 static void gvc_sound_theme_chooser_finalize (GObject *object);
219
220-G_DEFINE_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GTK_TYPE_VBOX)
221+G_DEFINE_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GTK_TYPE_BOX)
222
223 #define KEY_SOUNDS_SCHEMA "org.gnome.desktop.sound"
224 #define EVENT_SOUNDS_KEY "event-sounds"
225@@ -828,6 +828,7 @@
226 GObject *chooser;
227 chooser = g_object_new (GVC_TYPE_SOUND_THEME_CHOOSER,
228 "spacing", 6,
229+ "orientation", GTK_ORIENTATION_VERTICAL,
230 NULL);
231 return GTK_WIDGET (chooser);
232 }
233
234=== modified file 'panels/user-accounts/um-utils.c'
235--- panels/user-accounts/um-utils.c 2013-11-28 04:33:51 +0000
236+++ panels/user-accounts/um-utils.c 2014-02-18 04:28:49 +0000
237@@ -91,7 +91,7 @@
238 (gint)height,
239 GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_USE_BUILTIN);
240 pixbuf = gtk_icon_info_load_icon (info, NULL);
241- gtk_icon_info_free (info);
242+ g_object_unref (info);
243
244 cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
245 cairo_reset_clip (cr);
246
247=== modified file 'panels/wacom/calibrator/gui_gtk.c'
248--- panels/wacom/calibrator/gui_gtk.c 2012-07-19 15:39:36 +0000
249+++ panels/wacom/calibrator/gui_gtk.c 2014-02-18 04:28:49 +0000
250@@ -327,7 +327,7 @@
251 NULL,
252 NULL,
253 NULL);
254- gtk_icon_info_free (icon_info);
255+ g_object_unref (icon_info);
256 if (!area->icon_success)
257 g_warning ("Failed to load icon \"%s\"", ICON_SUCCESS);
258
259@@ -488,7 +488,7 @@
260
261 /* Black background */
262 gdk_rgba_parse (&black, "rgb(0,0,0)");
263- gtk_window_set_opacity (GTK_WINDOW (calib_area->window), WINDOW_OPACITY);
264+ gtk_widget_set_opacity (calib_area->window, WINDOW_OPACITY);
265
266 gtk_widget_realize (calib_area->window);
267 window = gtk_widget_get_window (calib_area->window);
268
269=== modified file 'panels/wacom/gsd-wacom-device.c'
270--- panels/wacom/gsd-wacom-device.c 2012-10-19 13:41:43 +0000
271+++ panels/wacom/gsd-wacom-device.c 2014-02-18 04:28:49 +0000
272@@ -1230,6 +1230,7 @@
273 const char *identifier)
274 {
275 char *settings_path;
276+ WacomIntegrationFlags integration_flags;
277
278 settings_path = g_strdup_printf (WACOM_DEVICE_CONFIG_BASE,
279 device->priv->machine_id,
280@@ -1239,7 +1240,8 @@
281
282 device->priv->name = g_strdup (libwacom_get_name (wacom_device));
283 device->priv->reversible = libwacom_is_reversible (wacom_device);
284- device->priv->is_screen_tablet = libwacom_is_builtin (wacom_device);
285+ integration_flags = libwacom_get_integration_flags (wacom_device);
286+ device->priv->is_screen_tablet = (integration_flags & WACOM_DEVICE_INTEGRATED_DISPLAY);
287 if (device->priv->is_screen_tablet) {
288 if (libwacom_get_class (wacom_device) == WCLASS_CINTIQ)
289 device->priv->icon_name = "wacom-tablet-cintiq";
290
291=== modified file 'shell/cc-shell-model.c'
292--- shell/cc-shell-model.c 2013-12-02 04:30:50 +0000
293+++ shell/cc-shell-model.c 2014-02-18 04:28:49 +0000
294@@ -54,7 +54,7 @@
295 g_error_free (err);
296 }
297
298- gtk_icon_info_free (icon_info);
299+ g_object_unref (icon_info);
300 }
301 else
302 {

Subscribers

People subscribed via source and target branches