settings: Fix some deprecated warnings

And make the default window size a little more reasonable.

4 files changed, 20 insertions, 18 deletions

diff --git a/settings/session-editor.c b/settings/session-editor.c
index a58888a3..32bc019e 100644
--- a/settings/session-editor.c
+++ b/settings/session-editor.c
@@ -126,10 +126,10 @@ session_editor_save_session(GtkWidget *btn,
 
     if(!xfsm_manager_dbus_client_checkpoint(manager_dbus_proxy, "", &error)) {
         xfce_message_dialog(GTK_WINDOW(gtk_widget_get_toplevel(btn)),
-                            _("Session Save Error"), GTK_STOCK_DIALOG_ERROR,
+                            _("Session Save Error"), "dialog-error",
                             _("Unable to save the session"),
                             error->message,
-                            GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
+                            _("_Close"), GTK_RESPONSE_ACCEPT,
                             NULL);
         gtk_widget_set_sensitive(btn, TRUE);
         g_error_free(error);
@@ -167,11 +167,11 @@ session_editor_clear_sessions(GtkWidget *btn,
     gtk_widget_set_sensitive(btn, FALSE);
 
     if(xfce_message_dialog(GTK_WINDOW(gtk_widget_get_toplevel(treeview)),
-                           _("Clear sessions"), GTK_STOCK_DIALOG_QUESTION,
+                           _("Clear sessions"), "dialog-question",
                            _("Are you sure you want to empty the session cache?"),
                            _("The saved states of your applications will not be restored during your next login."),
-                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                           XFCE_BUTTON_TYPE_MIXED, GTK_STOCK_OK, _("_Proceed"), GTK_RESPONSE_ACCEPT,
+                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                           XFCE_BUTTON_TYPE_MIXED, _("_Ok"), _("_Proceed"), GTK_RESPONSE_ACCEPT,
                            NULL) == GTK_RESPONSE_ACCEPT)
     {
         const gchar *item_name;
@@ -249,11 +249,11 @@ session_editor_quit_client(GtkWidget *btn,
     primary = g_strdup_printf(_("Are you sure you want to terminate \"%s\"?"),
                               name);
     if(xfce_message_dialog(GTK_WINDOW(gtk_widget_get_toplevel(treeview)),
-                           _("Terminate Program"), GTK_STOCK_DIALOG_QUESTION,
+                           _("Terminate Program"), "dialog-question",
                            primary,
                            _("The application will lose any unsaved state and will not be restarted in your next session."),
-                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                           XFCE_BUTTON_TYPE_MIXED, GTK_STOCK_QUIT, _("_Quit Program"), GTK_RESPONSE_ACCEPT,
+                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                           XFCE_BUTTON_TYPE_MIXED, _("_Quit"), _("_Quit Program"), GTK_RESPONSE_ACCEPT,
                            NULL) == GTK_RESPONSE_ACCEPT)
     {
         GError *error = NULL;
@@ -277,10 +277,10 @@ session_editor_quit_client(GtkWidget *btn,
 
         if(!xfsm_client_dbus_client_terminate(proxy, &error)) {
             xfce_message_dialog(GTK_WINDOW(gtk_widget_get_toplevel(treeview)),
-                                _("Terminate Program"), GTK_STOCK_DIALOG_ERROR,
+                                _("Terminate Program"), "dialog-error",
                                 _("Unable to terminate program."),
                                 error->message,
-                                GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
+                                _("Close"), GTK_RESPONSE_ACCEPT,
                                 NULL);
             g_error_free(error);
         }
diff --git a/settings/splash-settings.c b/settings/splash-settings.c
index a17ad61f..4892cf82 100644
--- a/settings/splash-settings.c
+++ b/settings/splash-settings.c
@@ -270,9 +270,9 @@ splash_selection_changed (GtkTreeSelection *selection)
             }
           else
             {
-              gtk_image_set_from_stock (GTK_IMAGE (splash_image),
-                                        GTK_STOCK_MISSING_IMAGE,
-                                        GTK_ICON_SIZE_DIALOG);
+              gtk_image_set_from_icon_name (GTK_IMAGE (splash_image),
+                                            "image-missing",
+                                            GTK_ICON_SIZE_DIALOG);
             }
 
           channel = xfconf_channel_get (SETTINGS_CHANNEL);
@@ -284,9 +284,9 @@ splash_selection_changed (GtkTreeSelection *selection)
         }
       else
         {
-          gtk_image_set_from_stock (GTK_IMAGE (splash_image),
-                                    GTK_STOCK_MISSING_IMAGE,
-                                    GTK_ICON_SIZE_DIALOG);
+          gtk_image_set_from_icon_name (GTK_IMAGE (splash_image),
+                                        "image-missing",
+                                        GTK_ICON_SIZE_DIALOG);
 
           gtk_label_set_text (GTK_LABEL (splash_descr1), _("None"));
           gtk_widget_set_sensitive (splash_descr1, FALSE);
diff --git a/settings/xfae-window.c b/settings/xfae-window.c
index f799f6a8..94b498ba 100644
--- a/settings/xfae-window.c
+++ b/settings/xfae-window.c
@@ -45,12 +45,12 @@ static void     xfae_window_selection_changed   (GtkTreeSelection *selection,
 
 struct _XfaeWindowClass
 {
-  GtkVBoxClass __parent__;
+  GtkBoxClass __parent__;
 };
 
 struct _XfaeWindow
 {
-  GtkVBox           __parent__;
+  GtkBox            __parent__;
 
   GtkTreeSelection *selection;
 
diff --git a/settings/xfce4-session-settings.ui b/settings/xfce4-session-settings.ui
index 0328a670..dc330914 100644
--- a/settings/xfce4-session-settings.ui
+++ b/settings/xfce4-session-settings.ui
@@ -6,6 +6,8 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Session and Startup</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default-width">600</property>
+    <property name="default-height">400</property>
     <property name="icon_name">xfce4-session</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">