From 148dffa32c100904f9e58afce26f9b75f45bb2ae Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Thu, 25 Feb 2010 10:26:23 -0600 Subject: Don't set the gdk decorations. --- src/gtk-dialog/logout-dialog.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/gtk-dialog') diff --git a/src/gtk-dialog/logout-dialog.c b/src/gtk-dialog/logout-dialog.c index 65df9fe..98806ca 100644 --- a/src/gtk-dialog/logout-dialog.c +++ b/src/gtk-dialog/logout-dialog.c @@ -278,7 +278,6 @@ logout_dialog_init (LogoutDialog *logout_dialog) gtk_widget_realize(GTK_WIDGET(logout_dialog)); /* remove superfluous window buttons */ gdk_window_set_functions (GTK_WIDGET(logout_dialog)->window, 0); - gdk_window_set_decorations (GTK_WIDGET(logout_dialog)->window, GDK_DECOR_BORDER | GDK_DECOR_TITLE); /* center window */ gtk_window_set_position (GTK_WINDOW(logout_dialog), GTK_WIN_POS_CENTER); -- cgit v1.2.3 From 8689698b0545046a871730b24ad0eef6414dd990 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 25 Feb 2010 16:38:38 -0600 Subject: Switching to getting a reply --- src/gtk-dialog/gtk-logout-helper.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'src/gtk-dialog') diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index 4c6614c..7973bfc 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -29,6 +29,15 @@ with this program. If not, see . #include "ck-pk-helper.h" #include "gconf-helper.h" +static void +console_kit_action_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) +{ + g_return_if_fail(DBUS_IS_G_PROXY(proxy)); + g_return_if_fail(call != NULL); + + +} + static void consolekit_fallback (LogoutDialogAction action) { @@ -48,14 +57,20 @@ consolekit_fallback (LogoutDialogAction action) g_warning("Unable to fallback to ConsoleKit for logout as it's a session issue. We need some sort of session handler."); break; case LOGOUT_DIALOG_SHUTDOWN: - dbus_g_proxy_call_no_reply(proxy, - "Stop", - G_TYPE_INVALID); + dbus_g_proxy_begin_call(proxy, + "Stop", + console_kit_action_cb, + NULL, /* data */ + NULL, /* destroy notifier */ + G_TYPE_INVALID); break; case LOGOUT_DIALOG_RESTART: - dbus_g_proxy_call_no_reply(proxy, - "Restart", - G_TYPE_INVALID); + dbus_g_proxy_begin_call(proxy, + "Restart", + console_kit_action_cb, + NULL, /* data */ + NULL, /* destroy notifier */ + G_TYPE_INVALID); break; default: g_warning("Unknown action"); -- cgit v1.2.3 From d605a1086d9fd4ca887c42c237aec5c246cda749 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 25 Feb 2010 16:42:30 -0600 Subject: can't really use async as we dont' have a mainloop here --- src/gtk-dialog/gtk-logout-helper.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'src/gtk-dialog') diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index 7973bfc..c8635e6 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -29,15 +29,6 @@ with this program. If not, see . #include "ck-pk-helper.h" #include "gconf-helper.h" -static void -console_kit_action_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) -{ - g_return_if_fail(DBUS_IS_G_PROXY(proxy)); - g_return_if_fail(call != NULL); - - -} - static void consolekit_fallback (LogoutDialogAction action) { @@ -52,25 +43,23 @@ consolekit_fallback (LogoutDialogAction action) return; } + GError * error = NULL; + switch (action) { case LOGOUT_DIALOG_LOGOUT: g_warning("Unable to fallback to ConsoleKit for logout as it's a session issue. We need some sort of session handler."); break; case LOGOUT_DIALOG_SHUTDOWN: - dbus_g_proxy_begin_call(proxy, - "Stop", - console_kit_action_cb, - NULL, /* data */ - NULL, /* destroy notifier */ - G_TYPE_INVALID); + dbus_g_proxy_call(proxy, + "Stop", + &error, + G_TYPE_INVALID); break; case LOGOUT_DIALOG_RESTART: - dbus_g_proxy_begin_call(proxy, - "Restart", - console_kit_action_cb, - NULL, /* data */ - NULL, /* destroy notifier */ - G_TYPE_INVALID); + dbus_g_proxy_call(proxy, + "Restart", + &error, + G_TYPE_INVALID); break; default: g_warning("Unknown action"); @@ -79,6 +68,11 @@ consolekit_fallback (LogoutDialogAction action) g_object_unref(proxy); + if (error != NULL) { + g_error("Unable to signal ConsoleKit: %s", error->message); + g_error_free(error); + } + return; } -- cgit v1.2.3 From fe25b2a8139d0c92a30440ba20862199a04f0f9c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 12:05:28 -0600 Subject: Changing shutdowns to switch offs --- src/gtk-dialog/gconf-helper.c | 4 ++-- src/gtk-dialog/gtk-logout-helper.c | 2 +- src/gtk-dialog/logout-dialog.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gtk-dialog') diff --git a/src/gtk-dialog/gconf-helper.c b/src/gtk-dialog/gconf-helper.c index 213592e..9262b19 100644 --- a/src/gtk-dialog/gconf-helper.c +++ b/src/gtk-dialog/gconf-helper.c @@ -51,11 +51,11 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC if (gconf_value_get_bool (value)) { dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off")); } else { dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out...")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown...")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off...")); } } } diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index d8aea6b..8a64c35 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -110,7 +110,7 @@ option_restart (const gchar * arg, const gchar * value, gpointer data, GError * static GOptionEntry options[] = { {"logout", 'l', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_logout, "Log out of the current session", NULL}, - {"shutdown", 's', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_shutdown, "Shutdown the entire system", NULL}, + {"shutdown", 's', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_shutdown, "Switch off the entire system", NULL}, {"restart", 'r', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_restart, "Restart the system", NULL}, {NULL} diff --git a/src/gtk-dialog/logout-dialog.c b/src/gtk-dialog/logout-dialog.c index 65df9fe..dc1b3fe 100644 --- a/src/gtk-dialog/logout-dialog.c +++ b/src/gtk-dialog/logout-dialog.c @@ -62,13 +62,13 @@ get_plural_string (LogoutDialog * dialog); static const gchar * title_strings[LOGOUT_DIALOG_ACTION_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"), /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Shut Down") + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off") }; static const gchar * button_strings[LOGOUT_DIALOG_ACTION_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"), /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Shut Down") + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off") }; static const gchar * restart_auth = N_("Restart..."); @@ -126,8 +126,8 @@ get_plural_string (LogoutDialog * dialog) dialog->timeout); break; case LOGOUT_DIALOG_SHUTDOWN: - plural_string = ngettext("The computer will be shut down in %d second.", - "The computer will be shut down in %d seconds.", + plural_string = ngettext("The computer will switch off in %d second.", + "The computer will switch off in %d seconds.", dialog->timeout); break; default: -- cgit v1.2.3