[Xfce4-commits] [xfce/xfce4-session] 11/30: settings: Fix some deprecated warnings
noreply at xfce.org
noreply at xfce.org
Sun May 15 18:03:30 CEST 2016
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-session.
commit 2811698e302178116b76e11d5a2b7cd0a75cc5c1
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Mon Apr 18 11:33:17 2016 +0300
settings: Fix some deprecated warnings
And make the default window size a little more reasonable.
---
settings/session-editor.c | 20 ++++++++++----------
settings/splash-settings.c | 12 ++++++------
settings/xfae-window.c | 4 ++--
settings/xfce4-session-settings.ui | 2 ++
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/settings/session-editor.c b/settings/session-editor.c
index a58888a..32bc019 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 a17ad61..4892cf8 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 f799f6a..94b498b 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 0328a67..dc33091 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">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list