Updating branch refs/heads/master to 68d8c335e2ae1afe2d5f469560f0db8d95d51550 (commit) from 771544d326e7335922bc3cb9b5e2900085e6e0db (commit)
commit 68d8c335e2ae1afe2d5f469560f0db8d95d51550 Author: Jérôme Guelfucci <jero...@xfce.org> Date: Fri Jan 22 18:33:49 2010 +0100 Port the settings dialog to libxfce4ui. settings/main.c | 12 +++++------- settings/xfae-window.c | 10 ++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/settings/main.c b/settings/main.c index 893248b..287fff9 100644 --- a/settings/main.c +++ b/settings/main.c @@ -29,6 +29,7 @@ #include <glade/glade.h> #include <libxfce4util/libxfce4util.h> +#include <libxfce4ui/libxfce4ui.h> #include "xfae-window.h" #include "xfce4-session-settings-common.h" @@ -80,12 +81,9 @@ main(int argc, } if(G_UNLIKELY(!xfconf_init(&error))) { - xfce_message_dialog(NULL, _("Session Settings"), - GTK_STOCK_DIALOG_ERROR, - _("Unable to contact settings server"), - error->message, - GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, - NULL); + xfce_dialog_show_error (NULL, + error, + _("Unable to contact settings server")); g_error_free(error); return EXIT_FAILURE; } @@ -120,7 +118,7 @@ main(int argc, g_object_unref(gxml); while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP) - xfce_spawn_command_line_on_screen("xfhelp4 xfce4-session.html", FALSE, FALSE, NULL); + g_spawn_command_line_async("xfhelp4 xfce4-session.html", NULL); gtk_widget_destroy(dialog); } else { diff --git a/settings/xfae-window.c b/settings/xfae-window.c index 269dfef..839e731 100644 --- a/settings/xfae-window.c +++ b/settings/xfae-window.c @@ -28,9 +28,7 @@ #include "xfae-dialog.h" #include "xfae-model.h" -#include <glib.h> -#include <glib/gi18n.h> -#include <gtk/gtk.h> +#include <libxfce4ui/libxfce4ui.h> static void xfae_window_add (XfaeWindow *window); static void xfae_window_remove (XfaeWindow *window); @@ -276,7 +274,7 @@ xfae_window_add (XfaeWindow *window) model = gtk_tree_view_get_model (GTK_TREE_VIEW (window->treeview)); if (!xfae_model_add (XFAE_MODEL (model), name, descr, command, &error)) { - xfce_dialog_show_error (0, error, _("Error")); + xfce_dialog_show_error (NULL, error, _("Error")); g_error_free (error); } @@ -302,7 +300,7 @@ xfae_window_remove (XfaeWindow *window) { if (!xfae_model_remove (XFAE_MODEL (model), &iter, &error)) { - xfce_dialog_show_error (0, error, _("Error")); + xfce_dialog_show_error (NULL, error, _("Error")); g_error_free (error); } } @@ -325,7 +323,7 @@ xfae_window_item_toggled (XfaeWindow *window, { if (!xfae_model_toggle (XFAE_MODEL (model), &iter, &error)) { - xfce_dialog_show_error (0, error, _("Error")); + xfce_dialog_show_error (NULL, error, _("Error")); g_error_free (error); } } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits