Merge lp:~robert-ancell/unity-control-center/gtk-stock-deprecated into lp:unity-control-center

[Robert Ancell]

Stop using deprecated GtkStock

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Ok, having to retranslate those things is not optimal, but that's GTK for us I guess...

review: Approve

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2014-02-12 20:26:06 +0000
+++ panels/appearance/cc-appearance-panel.c	2014-02-18 03:14:28 +0000
@@ -1048,8 +1048,8 @@
 	}
       else
         {
-          gtk_image_set_from_stock (GTK_IMAGE (preview),
-				    GTK_STOCK_DIALOG_QUESTION,
+          gtk_image_set_from_icon_name (GTK_IMAGE (preview),
+				    "dialog-question",
 				    GTK_ICON_SIZE_DIALOG);
 	}
 
@@ -1082,8 +1082,8 @@
   chooser = gtk_file_chooser_dialog_new (_("Browse for more pictures"),
 					 GTK_WINDOW (gtk_widget_get_toplevel (WID ("appearance-panel"))),
 					 GTK_FILE_CHOOSER_ACTION_OPEN,
-					 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+					 _("_Cancel"), GTK_RESPONSE_CANCEL,
+					 _("_Open"), GTK_RESPONSE_ACCEPT,
 					 NULL);
   gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (chooser), filter);
   gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
 
=== modified file 'panels/bluetooth/cc-bluetooth-panel.c'
--- panels/bluetooth/cc-bluetooth-panel.c	2013-11-28 04:32:11 +0000
+++ panels/bluetooth/cc-bluetooth-panel.c	2014-02-18 03:14:28 +0000
@@ -640,8 +640,8 @@
 		      _("If you remove the device, you will have to set it up again before next use."),
 		      NULL);
 
-	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_REMOVE, GTK_RESPONSE_ACCEPT);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Remove"), GTK_RESPONSE_ACCEPT);
 
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
 
 
=== modified file 'panels/color/cc-color-panel.c'
--- panels/color/cc-color-panel.c	2013-11-28 04:35:28 +0000
+++ panels/color/cc-color-panel.c	2014-02-18 03:14:28 +0000
@@ -227,7 +227,7 @@
   /* TRANSLATORS: an ICC profile is a file containing colorspace data */
   dialog = gtk_file_chooser_dialog_new (_("Select ICC Profile File"), window,
                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
                                         _("_Import"), GTK_RESPONSE_ACCEPT,
                                         NULL);
   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(dialog), g_get_home_dir ());
 
=== modified file 'panels/datetime/datetime-prefs-locations.c'
--- panels/datetime/datetime-prefs-locations.c	2014-02-10 22:51:08 +0000
+++ panels/datetime/datetime-prefs-locations.c	2014-02-18 03:14:28 +0000
@@ -308,7 +308,7 @@
 
     gtk_list_store_set (store, &iter,
                         COL_VISIBLE_NAME, new_text,
-                        COL_ICON, correct ? NULL : GTK_STOCK_DIALOG_ERROR,
+                        COL_ICON, correct ? NULL : "dialog-error",
                         -1);
   }
 }
 
=== modified file 'panels/datetime/datetime-prefs.c'
--- panels/datetime/datetime-prefs.c	2014-02-10 22:51:08 +0000
+++ panels/datetime/datetime-prefs.c	2014-02-18 03:14:28 +0000
@@ -218,8 +218,8 @@
   gtk_entry_set_text (GTK_ENTRY (self->priv->tz_entry), name);
   g_free (name);
 
-  gtk_entry_set_icon_from_stock (GTK_ENTRY (self->priv->tz_entry),
-                                 GTK_ENTRY_ICON_SECONDARY, NULL);
+  gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->tz_entry),
+                                     GTK_ENTRY_ICON_SECONDARY, NULL);
 }
 
 static void
@@ -634,8 +634,8 @@
   g_free (name);
   g_free (zone);
 
-  gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY,
-                                 correct ? NULL : GTK_STOCK_DIALOG_ERROR);
+  gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY,
+                                     correct ? NULL : "dialog-error");
   gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY,
                                    _("You need to choose a location to change the time zone."));
   gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, FALSE);
 
=== 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 03:14:28 +0000
@@ -969,7 +969,7 @@
                                          NULL);
         gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), warning);
         gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                _("_Cancel"), GTK_RESPONSE_CANCEL,
                                 _("Forget"), GTK_RESPONSE_OK,
                                 NULL);
         g_signal_connect (dialog, "response",
@@ -1632,7 +1632,7 @@
                                          GTK_BUTTONS_NONE,
                                          _("Stop hotspot and disconnect any users?"));
         gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                _("_Cancel"), GTK_RESPONSE_CANCEL,
                                 _("_Stop Hotspot"), GTK_RESPONSE_OK,
                                 NULL);
         g_signal_connect (dialog, "response",
 
=== modified file 'panels/printers/cc-printers-panel.c'
--- panels/printers/cc-printers-panel.c	2013-11-28 04:32:11 +0000
+++ panels/printers/cc-printers-panel.c	2014-02-18 03:14:28 +0000
@@ -1899,8 +1899,8 @@
   dialog = gtk_file_chooser_dialog_new (_("Select PPD File"),
                                         NULL,
                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Open"), GTK_RESPONSE_ACCEPT,
                                         NULL);
 
   filter = gtk_file_filter_new ();
 
=== 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 03:14:28 +0000
@@ -462,7 +462,7 @@
 
       priv->image = gtk_image_new_from_icon_name ("dialog-warning-symbolic", GTK_ICON_SIZE_MENU);
       if (!priv->image)
-        priv->image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
+        priv->image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_MENU);
       gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE, FALSE, 0);
       gtk_widget_set_no_show_all (GTK_WIDGET (priv->image), TRUE);
 
 
=== 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 03:14:28 +0000
@@ -1703,7 +1703,7 @@
         d = gtk_dialog_new_with_buttons (title,
                                          GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (widget))),
                                          GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                         _("_Close"), GTK_RESPONSE_CLOSE,
                                          NULL);
         gtk_window_set_has_resize_grip (GTK_WINDOW (d), FALSE);
 
 
=== modified file 'panels/user-accounts/um-fingerprint-dialog.c'
--- panels/user-accounts/um-fingerprint-dialog.c	2012-02-08 13:12:13 +0000
+++ panels/user-accounts/um-fingerprint-dialog.c	2014-02-18 03:14:28 +0000
@@ -266,11 +266,11 @@
                                            GTK_MESSAGE_QUESTION,
                                            GTK_BUTTONS_NONE,
                                            _("Delete registered fingerprints?"));
-        gtk_dialog_add_button (GTK_DIALOG (question), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+        gtk_dialog_add_button (GTK_DIALOG (question), _("_Cancel"), GTK_RESPONSE_CANCEL);
         gtk_window_set_modal (GTK_WINDOW (question), TRUE);
 
         button = gtk_button_new_with_mnemonic (_("_Delete Fingerprints"));
-        gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_stock (GTK_STOCK_DELETE, GTK_ICON_SIZE_BUTTON));
+        gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("edit-delete", GTK_ICON_SIZE_BUTTON));
         gtk_widget_set_can_default (button, TRUE);
         gtk_widget_show (button);
         gtk_dialog_add_action_widget (GTK_DIALOG (question), button, GTK_RESPONSE_OK);
 
=== modified file 'panels/user-accounts/um-photo-dialog.c'
--- panels/user-accounts/um-photo-dialog.c	2012-09-06 23:07:09 +0000
+++ panels/user-accounts/um-photo-dialog.c	2014-02-18 03:14:28 +0000
@@ -93,7 +93,7 @@
         dialog = gtk_dialog_new_with_buttons ("",
                                               GTK_WINDOW (gtk_widget_get_toplevel (um->popup_button)),
                                               0,
-                                              GTK_STOCK_CANCEL,
+                                              _("_Cancel"),
                                               GTK_RESPONSE_REJECT,
                                               _("Select"),
                                               GTK_RESPONSE_ACCEPT,
@@ -197,9 +197,9 @@
                         g_object_unref (pixbuf);
                 }
                 else {
-                        gtk_image_set_from_stock (GTK_IMAGE (preview),
-                                                  GTK_STOCK_DIALOG_QUESTION,
-                                                  GTK_ICON_SIZE_DIALOG);
+                        gtk_image_set_from_icon_name (GTK_IMAGE (preview),
+                                                      "dialog-question",
+                                                      GTK_ICON_SIZE_DIALOG);
                 }
 
                 g_free (uri);
@@ -218,8 +218,8 @@
         chooser = gtk_file_chooser_dialog_new (_("Browse for more pictures"),
                                                GTK_WINDOW (gtk_widget_get_toplevel (um->popup_button)),
                                                GTK_FILE_CHOOSER_ACTION_OPEN,
-                                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                               GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                               _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                               _("_Open"), GTK_RESPONSE_ACCEPT,
                                                NULL);
 
         gtk_window_set_modal (GTK_WINDOW (chooser), TRUE);
 
=== modified file 'panels/wacom/cc-wacom-page.c'
--- panels/wacom/cc-wacom-page.c	2012-12-20 10:48:07 +0000
+++ panels/wacom/cc-wacom-page.c	2014-02-18 03:14:28 +0000
@@ -894,7 +894,7 @@
 	priv->dialog = gtk_dialog_new_with_buttons (_("Display Mapping"),
 						    GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
 						    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-						    GTK_STOCK_CLOSE,
+						    _("_Close"),
 						    GTK_RESPONSE_ACCEPT,
 						    NULL);
 	priv->mapping = cc_wacom_mapping_panel_new ();