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
=== modified file 'panels/common/list-languages.c'
--- panels/common/list-languages.c 2012-10-01 07:32:18 +0000
+++ panels/common/list-languages.c 2014-02-18 04:28:49 +0000
@@ -14,8 +14,6 @@
14 setlocale (LC_ALL, NULL);14 setlocale (LC_ALL, NULL);
15 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");15 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
1616
17 g_type_init ();
18
19 if (argc > 1) {17 if (argc > 1) {
20 guint i;18 guint i;
21 for (i = 1; i < argc; i++) {19 for (i = 1; i < argc; i++) {
2220
=== modified file 'panels/info/cc-info-panel.c'
--- panels/info/cc-info-panel.c 2013-11-29 06:28:37 +0000
+++ panels/info/cc-info-panel.c 2014-02-18 04:28:49 +0000
@@ -951,8 +951,8 @@
951 g_signal_connect (G_OBJECT (webView), "navigation-policy-decision-requested",951 g_signal_connect (G_OBJECT (webView), "navigation-policy-decision-requested",
952 G_CALLBACK (url_nav_callback), sw);952 G_CALLBACK (url_nav_callback), sw);
953953
954 gtk_container_add (GTK_CONTAINER (sw), webView);954 gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (webView));
955 gtk_notebook_append_page (WID ("notebook"), sw, NULL);955 gtk_notebook_append_page (GTK_NOTEBOOK (WID ("notebook")), sw, NULL);
956 gtk_widget_show_all(sw);956 gtk_widget_show_all(sw);
957}957}
958958
959959
=== modified file 'panels/network/net-device-wifi.c'
--- panels/network/net-device-wifi.c 2013-11-28 06:13:40 +0000
+++ panels/network/net-device-wifi.c 2014-02-18 04:28:49 +0000
@@ -140,7 +140,7 @@
140{140{
141 const GByteArray *ssid;141 const GByteArray *ssid;
142 const gchar *object_path;142 const gchar *object_path;
143 const gchar *ssid_text;143 gchar *ssid_text;
144 gboolean is_active_ap;144 gboolean is_active_ap;
145 gchar *title;145 gchar *title;
146 GtkListStore *liststore_network;146 GtkListStore *liststore_network;
@@ -520,7 +520,7 @@
520{520{
521 const GByteArray *ssid;521 const GByteArray *ssid;
522 const gchar *id;522 const gchar *id;
523 const gchar *ssid_text;523 gchar *ssid_text;
524 gchar *title;524 gchar *title;
525 GtkListStore *store;525 GtkListStore *store;
526 GtkTreeIter iter;526 GtkTreeIter iter;
@@ -1076,7 +1076,7 @@
1076 const gchar *ap_object_path)1076 const gchar *ap_object_path)
1077{1077{
1078 const GByteArray *ssid;1078 const GByteArray *ssid;
1079 const gchar *ssid_tmp = NULL;1079 gchar *ssid_tmp = NULL;
1080 GSList *list, *l;1080 GSList *list, *l;
1081 GSList *filtered;1081 GSList *filtered;
1082 NMConnection *connection_activate = NULL;1082 NMConnection *connection_activate = NULL;
10831083
=== modified file 'panels/printers/pp-ppd-option-widget.c'
--- panels/printers/pp-ppd-option-widget.c 2012-09-11 13:02:26 +0000
+++ panels/printers/pp-ppd-option-widget.c 2014-02-18 04:28:49 +0000
@@ -58,7 +58,7 @@
58 gboolean ppd_filename_set;58 gboolean ppd_filename_set;
59};59};
6060
61G_DEFINE_TYPE (PpPPDOptionWidget, pp_ppd_option_widget, GTK_TYPE_HBOX)61G_DEFINE_TYPE (PpPPDOptionWidget, pp_ppd_option_widget, GTK_TYPE_BOX)
6262
63/* This list comes from Gtk+ */63/* This list comes from Gtk+ */
64static const struct {64static const struct {
@@ -233,7 +233,7 @@
233233
234 if (option && printer_name)234 if (option && printer_name)
235 {235 {
236 widget = g_object_new (PP_TYPE_PPD_OPTION_WIDGET, NULL);236 widget = g_object_new (PP_TYPE_PPD_OPTION_WIDGET, "orientation", GTK_ORIENTATION_HORIZONTAL, NULL);
237237
238 priv = PP_PPD_OPTION_WIDGET_GET_PRIVATE (widget);238 priv = PP_PPD_OPTION_WIDGET_GET_PRIVATE (widget);
239239
240240
=== modified file 'panels/region/gnome-region-panel-input.c'
--- panels/region/gnome-region-panel-input.c 2013-11-28 06:08:25 +0000
+++ panels/region/gnome-region-panel-input.c 2014-02-18 04:28:49 +0000
@@ -1431,7 +1431,7 @@
1431 GVariant *variant,1431 GVariant *variant,
1432 gpointer user_data)1432 gpointer user_data)
1433{1433{
1434 gchar **switch_key;1434 const gchar **switch_key;
14351435
1436 switch_key = g_variant_get_strv (variant, NULL);1436 switch_key = g_variant_get_strv (variant, NULL);
1437 g_value_set_string (value, switch_key[0]);1437 g_value_set_string (value, switch_key[0]);
@@ -1445,7 +1445,7 @@
1445 const GVariantType *expected_type,1445 const GVariantType *expected_type,
1446 gpointer user_data)1446 gpointer user_data)
1447{1447{
1448 gchar *switch_key;1448 const gchar *switch_key;
1449 gchar **switch_strv;1449 gchar **switch_strv;
1450 GVariant *ret = NULL;1450 GVariant *ret = NULL;
14511451
14521452
=== modified file 'panels/screen/cc-screen-panel.c'
--- panels/screen/cc-screen-panel.c 2013-11-28 06:03:56 +0000
+++ panels/screen/cc-screen-panel.c 2014-02-18 04:28:49 +0000
@@ -19,6 +19,8 @@
19 *19 *
20 */20 */
2121
22#include <string.h>
23
22#include "cc-screen-panel.h"24#include "cc-screen-panel.h"
2325
24CC_PANEL_REGISTER (CcScreenPanel, cc_screen_panel)26CC_PANEL_REGISTER (CcScreenPanel, cc_screen_panel)
2527
=== modified file 'panels/sound/gvc-balance-bar.c'
--- panels/sound/gvc-balance-bar.c 2013-12-03 03:04:42 +0000
+++ panels/sound/gvc-balance-bar.c 2014-02-18 04:28:49 +0000
@@ -76,7 +76,7 @@
76static void on_adjustment_value_changed (GtkAdjustment *adjustment,76static void on_adjustment_value_changed (GtkAdjustment *adjustment,
77 GvcBalanceBar *bar);77 GvcBalanceBar *bar);
7878
79G_DEFINE_TYPE (GvcBalanceBar, gvc_balance_bar, GTK_TYPE_HBOX)79G_DEFINE_TYPE (GvcBalanceBar, gvc_balance_bar, GTK_TYPE_BOX)
8080
81static GtkWidget *81static GtkWidget *
82_scale_box_new (GvcBalanceBar *bar)82_scale_box_new (GvcBalanceBar *bar)
@@ -90,7 +90,7 @@
90 gdouble lower, upper;90 gdouble lower, upper;
9191
92 bar->priv->scale_box = box = gtk_box_new (FALSE, 6);92 bar->priv->scale_box = box = gtk_box_new (FALSE, 6);
93 priv->scale = gtk_hscale_new (priv->adjustment);93 priv->scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, priv->adjustment);
94 gtk_widget_set_size_request (priv->scale, SCALE_SIZE, -1);94 gtk_widget_set_size_request (priv->scale, SCALE_SIZE, -1);
95 gtk_scale_set_has_origin (GTK_SCALE (priv->scale), FALSE);95 gtk_scale_set_has_origin (GTK_SCALE (priv->scale), FALSE);
96 gtk_widget_set_name (priv->scale, "balance-bar-scale");96 gtk_widget_set_name (priv->scale, "balance-bar-scale");
@@ -569,7 +569,9 @@
569{569{
570 GObject *bar;570 GObject *bar;
571 bar = g_object_new (GVC_TYPE_BALANCE_BAR,571 bar = g_object_new (GVC_TYPE_BALANCE_BAR,
572 "balance-type", btype, NULL);572 "balance-type", btype,
573 "orientation", GTK_ORIENTATION_HORIZONTAL,
574 NULL);
573575
574 return GTK_WIDGET (bar);576 return GTK_WIDGET (bar);
575}577}
576578
=== modified file 'panels/sound/gvc-channel-bar.c'
--- panels/sound/gvc-channel-bar.c 2012-06-25 12:41:31 +0000
+++ panels/sound/gvc-channel-bar.c 2014-02-18 04:28:49 +0000
@@ -99,7 +99,7 @@
99 GdkEventScroll *event,99 GdkEventScroll *event,
100 GvcChannelBar *bar);100 GvcChannelBar *bar);
101101
102G_DEFINE_TYPE (GvcChannelBar, gvc_channel_bar, GTK_TYPE_HBOX)102G_DEFINE_TYPE (GvcChannelBar, gvc_channel_bar, GTK_TYPE_BOX)
103103
104static GtkWidget *104static GtkWidget *
105_scale_box_new (GvcChannelBar *bar)105_scale_box_new (GvcChannelBar *bar)
@@ -969,6 +969,7 @@
969{969{
970 GObject *bar;970 GObject *bar;
971 bar = g_object_new (GVC_TYPE_CHANNEL_BAR,971 bar = g_object_new (GVC_TYPE_CHANNEL_BAR,
972 "orientation", GTK_ORIENTATION_HORIZONTAL,
972 NULL);973 NULL);
973 return GTK_WIDGET (bar);974 return GTK_WIDGET (bar);
974}975}
975976
=== modified file 'panels/sound/gvc-combo-box.c'
--- panels/sound/gvc-combo-box.c 2012-02-08 12:11:02 +0000
+++ panels/sound/gvc-combo-box.c 2014-02-18 04:28:49 +0000
@@ -75,7 +75,7 @@
75static void gvc_combo_box_init (GvcComboBox *combo_box);75static void gvc_combo_box_init (GvcComboBox *combo_box);
76static void gvc_combo_box_finalize (GObject *object);76static void gvc_combo_box_finalize (GObject *object);
7777
78G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_HBOX)78G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_BOX)
7979
80void80void
81gvc_combo_box_set_size_group (GvcComboBox *combo_box,81gvc_combo_box_set_size_group (GvcComboBox *combo_box,
@@ -392,6 +392,7 @@
392 GObject *combo_box;392 GObject *combo_box;
393 combo_box = g_object_new (GVC_TYPE_COMBO_BOX,393 combo_box = g_object_new (GVC_TYPE_COMBO_BOX,
394 "label", label,394 "label", label,
395 "orientation", GTK_ORIENTATION_HORIZONTAL,
395 NULL);396 NULL);
396 return GTK_WIDGET (combo_box);397 return GTK_WIDGET (combo_box);
397}398}
398399
=== modified file 'panels/sound/gvc-mixer-dialog.c'
--- panels/sound/gvc-mixer-dialog.c 2013-12-03 03:04:42 +0000
+++ panels/sound/gvc-mixer-dialog.c 2014-02-18 04:28:49 +0000
@@ -141,7 +141,7 @@
141 guint id,141 guint id,
142 GvcMixerDialog *dialog);142 GvcMixerDialog *dialog);
143143
144G_DEFINE_TYPE (GvcMixerDialog, gvc_mixer_dialog, GTK_TYPE_VBOX)144G_DEFINE_TYPE (GvcMixerDialog, gvc_mixer_dialog, GTK_TYPE_BOX)
145145
146146
147static void147static void
@@ -2171,6 +2171,7 @@
2171 GObject *dialog;2171 GObject *dialog;
2172 dialog = g_object_new (GVC_TYPE_MIXER_DIALOG,2172 dialog = g_object_new (GVC_TYPE_MIXER_DIALOG,
2173 "mixer-control", control,2173 "mixer-control", control,
2174 "orientation", GTK_ORIENTATION_VERTICAL,
2174 NULL);2175 NULL);
2175 return GVC_MIXER_DIALOG (dialog);2176 return GVC_MIXER_DIALOG (dialog);
2176}2177}
21772178
=== modified file 'panels/sound/gvc-sound-theme-chooser.c'
--- panels/sound/gvc-sound-theme-chooser.c 2013-11-28 04:43:22 +0000
+++ panels/sound/gvc-sound-theme-chooser.c 2014-02-18 04:28:49 +0000
@@ -54,7 +54,7 @@
54static void gvc_sound_theme_chooser_init (GvcSoundThemeChooser *sound_theme_chooser);54static void gvc_sound_theme_chooser_init (GvcSoundThemeChooser *sound_theme_chooser);
55static void gvc_sound_theme_chooser_finalize (GObject *object);55static void gvc_sound_theme_chooser_finalize (GObject *object);
5656
57G_DEFINE_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GTK_TYPE_VBOX)57G_DEFINE_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GTK_TYPE_BOX)
5858
59#define KEY_SOUNDS_SCHEMA "org.gnome.desktop.sound"59#define KEY_SOUNDS_SCHEMA "org.gnome.desktop.sound"
60#define EVENT_SOUNDS_KEY "event-sounds"60#define EVENT_SOUNDS_KEY "event-sounds"
@@ -828,6 +828,7 @@
828 GObject *chooser;828 GObject *chooser;
829 chooser = g_object_new (GVC_TYPE_SOUND_THEME_CHOOSER,829 chooser = g_object_new (GVC_TYPE_SOUND_THEME_CHOOSER,
830 "spacing", 6,830 "spacing", 6,
831 "orientation", GTK_ORIENTATION_VERTICAL,
831 NULL);832 NULL);
832 return GTK_WIDGET (chooser);833 return GTK_WIDGET (chooser);
833}834}
834835
=== modified file 'panels/user-accounts/um-utils.c'
--- panels/user-accounts/um-utils.c 2013-11-28 04:33:51 +0000
+++ panels/user-accounts/um-utils.c 2014-02-18 04:28:49 +0000
@@ -91,7 +91,7 @@
91 (gint)height,91 (gint)height,
92 GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_USE_BUILTIN);92 GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_USE_BUILTIN);
93 pixbuf = gtk_icon_info_load_icon (info, NULL);93 pixbuf = gtk_icon_info_load_icon (info, NULL);
94 gtk_icon_info_free (info);94 g_object_unref (info);
9595
96 cairo_set_operator (cr, CAIRO_OPERATOR_OVER);96 cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
97 cairo_reset_clip (cr);97 cairo_reset_clip (cr);
9898
=== modified file 'panels/wacom/calibrator/gui_gtk.c'
--- panels/wacom/calibrator/gui_gtk.c 2012-07-19 15:39:36 +0000
+++ panels/wacom/calibrator/gui_gtk.c 2014-02-18 04:28:49 +0000
@@ -327,7 +327,7 @@
327 NULL,327 NULL,
328 NULL,328 NULL,
329 NULL);329 NULL);
330 gtk_icon_info_free (icon_info);330 g_object_unref (icon_info);
331 if (!area->icon_success)331 if (!area->icon_success)
332 g_warning ("Failed to load icon \"%s\"", ICON_SUCCESS);332 g_warning ("Failed to load icon \"%s\"", ICON_SUCCESS);
333333
@@ -488,7 +488,7 @@
488488
489 /* Black background */489 /* Black background */
490 gdk_rgba_parse (&black, "rgb(0,0,0)");490 gdk_rgba_parse (&black, "rgb(0,0,0)");
491 gtk_window_set_opacity (GTK_WINDOW (calib_area->window), WINDOW_OPACITY);491 gtk_widget_set_opacity (calib_area->window, WINDOW_OPACITY);
492492
493 gtk_widget_realize (calib_area->window);493 gtk_widget_realize (calib_area->window);
494 window = gtk_widget_get_window (calib_area->window);494 window = gtk_widget_get_window (calib_area->window);
495495
=== modified file 'panels/wacom/gsd-wacom-device.c'
--- panels/wacom/gsd-wacom-device.c 2012-10-19 13:41:43 +0000
+++ panels/wacom/gsd-wacom-device.c 2014-02-18 04:28:49 +0000
@@ -1230,6 +1230,7 @@
1230 const char *identifier)1230 const char *identifier)
1231{1231{
1232 char *settings_path;1232 char *settings_path;
1233 WacomIntegrationFlags integration_flags;
12331234
1234 settings_path = g_strdup_printf (WACOM_DEVICE_CONFIG_BASE,1235 settings_path = g_strdup_printf (WACOM_DEVICE_CONFIG_BASE,
1235 device->priv->machine_id,1236 device->priv->machine_id,
@@ -1239,7 +1240,8 @@
12391240
1240 device->priv->name = g_strdup (libwacom_get_name (wacom_device));1241 device->priv->name = g_strdup (libwacom_get_name (wacom_device));
1241 device->priv->reversible = libwacom_is_reversible (wacom_device);1242 device->priv->reversible = libwacom_is_reversible (wacom_device);
1242 device->priv->is_screen_tablet = libwacom_is_builtin (wacom_device);1243 integration_flags = libwacom_get_integration_flags (wacom_device);
1244 device->priv->is_screen_tablet = (integration_flags & WACOM_DEVICE_INTEGRATED_DISPLAY);
1243 if (device->priv->is_screen_tablet) {1245 if (device->priv->is_screen_tablet) {
1244 if (libwacom_get_class (wacom_device) == WCLASS_CINTIQ)1246 if (libwacom_get_class (wacom_device) == WCLASS_CINTIQ)
1245 device->priv->icon_name = "wacom-tablet-cintiq";1247 device->priv->icon_name = "wacom-tablet-cintiq";
12461248
=== modified file 'shell/cc-shell-model.c'
--- shell/cc-shell-model.c 2013-12-02 04:30:50 +0000
+++ shell/cc-shell-model.c 2014-02-18 04:28:49 +0000
@@ -54,7 +54,7 @@
54 g_error_free (err);54 g_error_free (err);
55 }55 }
5656
57 gtk_icon_info_free (icon_info);57 g_object_unref (icon_info);
58 }58 }
59 else59 else
60 {60 {

Subscribers

People subscribed via source and target branches