From de04f7ce9ae92df14ae59f7b411fb508068669a2 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 8 Feb 2010 10:13:02 -0600 Subject: Lockdown --- src/session-service.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 8306d02..33d7bec 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -50,6 +50,9 @@ with this program. If not, see . #define GUEST_SESSION_LAUNCHER "/usr/share/gdm/guest-session/guest-session-launch" +#define LOCKDOWN_DIR "/desktop/gnome/lockdown" +#define LOCKDOWN_KEY LOCKDOWNDIR "/disable_user_switching" + typedef struct _ActivateData ActivateData; struct _ActivateData { @@ -62,6 +65,7 @@ static DBusGProxy *gdm_proxy = NULL; static UsersServiceDbus *dbus_interface = NULL; static DbusmenuMenuitem *lock_menuitem = NULL; +static DbusmenuMenuitem *switch_menuitem = NULL; static gint count; static GList *users; @@ -80,6 +84,50 @@ static DbusmenuMenuitem * logout_mi = NULL; static DbusmenuMenuitem * restart_mi = NULL; static DbusmenuMenuitem * shutdown_mi = NULL; +static GConfClient * gconf_client = NULL; +static guint notify_lockdown_id = 0; + +static void +lockdown_changed (GConfClient *client, + guint cnxd_id, + GConfEntry *entry, + gpointer user_data) +{ + GConfValue *value = gconf_entry_get_value (entry); + const gchar *key = gconf_entry_get_key (entry); + + if (!value || !key) + return; + + if (g_strcmp0 (key, LOCKDOWN_KEY) == 0) + { + if (gconf_value_get_bool (value)) + { + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + } + else + { + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + } + } +} + +static void +ensure_gconf_client (void) +{ + if (!gconf_client) + { + gconf_client = gconf_client_get_default (); + + notify_lockdown_id = gconf_client_notify_add (gconf_client, + LOCKDOWN_KEY, + (GConfClientNotifyFunc)lockdown_changed, + NULL, + NULL, + NULL); + } +} + /* A return from the command to sleep the system. Make sure that we unthrottle the screensaver. */ static void @@ -441,13 +489,18 @@ rebuild_items (DbusmenuMenuitem *root, if (check_new_session ()) { - mi = dbusmenu_menuitem_new (); - dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User...")); - dbusmenu_menuitem_child_append (root, mi); - g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL); + ensure_gconf_client (); + + if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY, NULL)) + { + switch_menuitem = dbusmenu_menuitem_new (); + dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User...")); + dbusmenu_menuitem_child_append (root, switch_menuitem); + g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL); + } } } - + DbusmenuMenuitem * separator = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); dbusmenu_menuitem_child_append(root, separator); -- cgit v1.2.3 From a16c8f412a4fe6f57a59386787081118730426c4 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 8 Feb 2010 10:19:49 -0600 Subject: Fix a typo --- src/session-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index 33d7bec..0038931 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -51,7 +51,7 @@ with this program. If not, see . #define GUEST_SESSION_LAUNCHER "/usr/share/gdm/guest-session/guest-session-launch" #define LOCKDOWN_DIR "/desktop/gnome/lockdown" -#define LOCKDOWN_KEY LOCKDOWNDIR "/disable_user_switching" +#define LOCKDOWN_KEY LOCKDOWN_DIR "/disable_user_switching" typedef struct _ActivateData ActivateData; struct _ActivateData -- cgit v1.2.3 From 751fbe8b0f5c049abdaa007b104772691305e21f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 10:49:34 -0600 Subject: Only building the proxy when we try to do something with the proxy. --- src/lock-helper.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/lock-helper.c b/src/lock-helper.c index ded1b33..24b76ed 100644 --- a/src/lock-helper.c +++ b/src/lock-helper.c @@ -35,6 +35,8 @@ static gboolean is_guest = FALSE; static gdm_autologin_cb_t gdm_autologin_cb = NULL; +void build_gss_proxy (void); + /* Checks to see if there is an error and reports it. Not much else we can do. */ static void @@ -56,6 +58,9 @@ screensaver_unthrottle (void) { g_return_if_fail(cookie != 0); + build_gss_proxy(); + g_return_if_fail(gss_proxy != NULL); + dbus_g_proxy_begin_call(gss_proxy, "UnThrottle", unthrottle_return, NULL, NULL, @@ -103,6 +108,9 @@ screensaver_throttle (gchar * reason) screensaver_unthrottle(); } + build_gss_proxy(); + g_return_if_fail(gss_proxy != NULL); + cookie_call = dbus_g_proxy_begin_call(gss_proxy, "Throttle", throttle_return, NULL, NULL, @@ -245,17 +253,19 @@ gss_active_changed (DBusGProxy * proxy, gboolean active, gpointer data) void build_gss_proxy (void) { - DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); - g_return_if_fail(session_bus != NULL); - - gss_proxy = dbus_g_proxy_new_for_name(session_bus, - "org.gnome.ScreenSaver", - "/", - "org.gnome.ScreenSaver"); - g_return_if_fail(gss_proxy != NULL); - - dbus_g_proxy_add_signal(gss_proxy, "ActiveChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(gss_proxy, "ActiveChanged", G_CALLBACK(gss_active_changed), NULL, NULL); + if (gss_proxy == NULL) { + DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + g_return_if_fail(session_bus != NULL); + + gss_proxy = dbus_g_proxy_new_for_name(session_bus, + "org.gnome.ScreenSaver", + "/", + "org.gnome.ScreenSaver"); + g_return_if_fail(gss_proxy != NULL); + + dbus_g_proxy_add_signal(gss_proxy, "ActiveChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(gss_proxy, "ActiveChanged", G_CALLBACK(gss_active_changed), NULL, NULL); + } return; } @@ -286,6 +296,7 @@ lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data) return; } + build_gss_proxy(); g_return_if_fail(gss_proxy != NULL); dbus_g_proxy_call_no_reply(gss_proxy, @@ -318,7 +329,6 @@ lock_screen_setup (gpointer data) } build_gdm_proxy(); - build_gss_proxy(); return FALSE; } -- cgit v1.2.3 From 834d779178f8670fbfeb5f8a4e0e4ca9964f6e03 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 10:59:44 -0600 Subject: Removing the gdm proxy creation and usage. --- src/lock-helper.c | 112 ------------------------------------------------------ src/lock-helper.h | 3 -- 2 files changed, 115 deletions(-) diff --git a/src/lock-helper.c b/src/lock-helper.c index 24b76ed..b38be65 100644 --- a/src/lock-helper.c +++ b/src/lock-helper.c @@ -27,14 +27,8 @@ static GMainLoop * gss_mainloop = NULL; static guint cookie = 0; static DBusGProxyCall * cookie_call = NULL; -static DBusGProxy * gdm_settings_proxy = NULL; -static gboolean gdm_auto_login = FALSE; -static const gchar * gdm_auto_login_string = "daemon/AutomaticLoginEnable"; - static gboolean is_guest = FALSE; -static gdm_autologin_cb_t gdm_autologin_cb = NULL; - void build_gss_proxy (void); /* Checks to see if there is an error and reports @@ -121,26 +115,11 @@ screensaver_throttle (gchar * reason) return; } -/* Setting up a call back */ -void -lock_screen_gdm_cb_set (gdm_autologin_cb_t cb) -{ - if (gdm_autologin_cb) { - g_warning("Already had a callback, setting up a new one..."); - } - - gdm_autologin_cb = cb; - return; -} - /* This is our logic on whether the screen should be locked or not. It effects everything else. */ gboolean will_lock_screen (void) { - if (gdm_auto_login) { - return FALSE; - } if (is_guest) { return FALSE; } @@ -148,95 +127,6 @@ will_lock_screen (void) return TRUE; } -/* Respond to the signal of autologin changing to see if the - setting for timed login changes. */ -static void -gdm_settings_change (DBusGProxy * proxy, const gchar * value, const gchar * old, const gchar * new, gpointer data) -{ - if (g_strcmp0(value, gdm_auto_login_string)) { - /* This is not a setting that we care about, - there is only one. */ - return; - } - g_debug("GDM Settings change: %s", new); - - if (g_strcmp0(new, "true") == 0) { - gdm_auto_login = TRUE; - } else { - gdm_auto_login = FALSE; - } - - if (gdm_autologin_cb != NULL) { - gdm_autologin_cb(); - } - - return; -} - -/* Get back the data from querying to see if there is auto - login enabled in GDM */ -static void -gdm_get_autologin (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data) -{ - GError * error = NULL; - gchar * value = NULL; - - if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_STRING, &value, G_TYPE_INVALID)) { - g_warning("Unable to get autologin setting: %s", error != NULL ? error->message : "null"); - g_error_free(error); - return; - } - - g_return_if_fail(value != NULL); - gdm_settings_change(proxy, gdm_auto_login_string, NULL, value, NULL); - - return; -} - -/* Sets up the proxy and queries for the setting to know - whether we're doing an autologin. */ -static void -build_gdm_proxy (void) -{ - g_return_if_fail(gdm_settings_proxy == NULL); - - /* Grab the system bus */ - DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL); - g_return_if_fail(bus != NULL); - - /* Get the settings proxy */ - gdm_settings_proxy = dbus_g_proxy_new_for_name_owner(bus, - "org.gnome.DisplayManager", - "/org/gnome/DisplayManager/Settings", - "org.gnome.DisplayManager.Settings", NULL); - g_return_if_fail(gdm_settings_proxy != NULL); - - /* Signal for value changed */ - dbus_g_proxy_add_signal(gdm_settings_proxy, - "ValueChanged", - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal(gdm_settings_proxy, - "ValueChanged", - G_CALLBACK(gdm_settings_change), - NULL, - NULL); - - /* Start to get the initial value */ - dbus_g_proxy_begin_call(gdm_settings_proxy, - "GetValue", - gdm_get_autologin, - NULL, - NULL, - G_TYPE_STRING, - gdm_auto_login_string, - G_TYPE_INVALID); - - return; -} - /* When the screensave go active, if we've got a mainloop running we should quit it. */ static void @@ -328,8 +218,6 @@ lock_screen_setup (gpointer data) is_guest = TRUE; } - build_gdm_proxy(); - return FALSE; } diff --git a/src/lock-helper.h b/src/lock-helper.h index ebcd635..37f1448 100644 --- a/src/lock-helper.h +++ b/src/lock-helper.h @@ -24,14 +24,11 @@ with this program. If not, see . #include -typedef void (*gdm_autologin_cb_t) (void); - void screensaver_throttle (gchar * reason); void screensaver_unthrottle (void); gboolean will_lock_screen (void); void lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data); gboolean lock_screen_setup (gpointer data); -void lock_screen_gdm_cb_set (gdm_autologin_cb_t cb); #endif /* LOCK_HELPER_H__ */ -- cgit v1.2.3 From eedadcc3cf3a3f76fbe7b308a9ae7f0fa1f888d7 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 8 Feb 2010 11:01:13 -0600 Subject: Check switch_menuitem for NULL first --- src/session-service.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 0038931..62987f2 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -101,13 +101,16 @@ lockdown_changed (GConfClient *client, if (g_strcmp0 (key, LOCKDOWN_KEY) == 0) { - if (gconf_value_get_bool (value)) + if (switch_menuitem) { - dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); - } - else - { - dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + if (gconf_value_get_bool (value)) + { + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + } + else + { + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + } } } } -- cgit v1.2.3 From 3b8cf7767822cd7d7b0441cf6342cc731c91dafc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 11:01:55 -0600 Subject: Removing the callback into the lock helper for GDM autologin settings change. --- src/session-service.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 8306d02..c3c8431 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -264,20 +264,6 @@ show_dialog (DbusmenuMenuitem * mi, guint timestamp, gchar * type) return; } -/* Respond to the signal of autologin changing to see if the - setting for timed login changes. */ -static void -gdm_settings_change (void) -{ - if (!will_lock_screen()) { - dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE); - } else { - dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); - } - - return; -} - /* Checks to see if we should show the guest suession item */ static gboolean check_guest_session (void) @@ -574,7 +560,6 @@ main (int argc, char ** argv) G_CALLBACK(service_shutdown), NULL); g_idle_add(lock_screen_setup, NULL); - lock_screen_gdm_cb_set(gdm_settings_change); root_menuitem = dbusmenu_menuitem_new(); g_debug("Root ID: %d", dbusmenu_menuitem_get_id(root_menuitem)); -- cgit v1.2.3 From 6335f484c1ebe1ee6f0c940614bf4dbdfaeb2e8d Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 8 Feb 2010 11:08:09 -0600 Subject: Fixes --- src/session-service.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 62987f2..621ab72 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -109,7 +109,7 @@ lockdown_changed (GConfClient *client, } else { - dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); } } } @@ -494,12 +494,18 @@ rebuild_items (DbusmenuMenuitem *root, { ensure_gconf_client (); + switch_menuitem = dbusmenu_menuitem_new (); + dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User...")); + dbusmenu_menuitem_child_append (root, switch_menuitem); + g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL); + if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY, NULL)) { - switch_menuitem = dbusmenu_menuitem_new (); - dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User...")); - dbusmenu_menuitem_child_append (root, switch_menuitem); - g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL); + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + } + else + { + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); } } } -- cgit v1.2.3 From 19ebc417eafb4cea2e9e1d5656c46148d8f100ed Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 8 Feb 2010 11:24:13 -0600 Subject: Remove unnecessary cast --- src/session-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index 621ab72..791611e 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -124,7 +124,7 @@ ensure_gconf_client (void) notify_lockdown_id = gconf_client_notify_add (gconf_client, LOCKDOWN_KEY, - (GConfClientNotifyFunc)lockdown_changed, + lockdown_changed, NULL, NULL, NULL); -- cgit v1.2.3 From 4ec15094555e5bc71a46f16ea9bf101e41e59631 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 17:04:25 -0600 Subject: First pass, get the string. --- src/session-service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index e89a9a0..3cbb29c 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -481,7 +481,9 @@ rebuild_items (DbusmenuMenuitem *root, ensure_gconf_client (); switch_menuitem = dbusmenu_menuitem_new (); - dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User...")); + gchar * switchlabel = g_strdup_printf(_("Switch from %s..."), g_get_user_name()); + dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, switchlabel); + g_free(switchlabel); dbusmenu_menuitem_child_append (root, switch_menuitem); g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL); -- cgit v1.2.3 From db69cb8bdc95ac86a15118a9ef1e40c3c6dfb03c Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Tue, 9 Feb 2010 17:24:23 -0600 Subject: The reincarnation of user switching --- src/users-service-dbus.c | 66 +++++------------------------------------------- src/users-service-dbus.h | 2 +- 2 files changed, 8 insertions(+), 60 deletions(-) diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index e05eaf5..d377089 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -443,37 +443,6 @@ get_unix_user (UsersServiceDbus *service, return TRUE; } -static gchar * -get_session_for_user (UsersServiceDbus *service, - UserData *user) -{ - GList *l; - - if (!users_service_dbus_can_activate_session (service)) - { - return NULL; - } - - if (!user->sessions || g_list_length (user->sessions) == 0) - { - return NULL; - } - - for (l = user->sessions; l != NULL; l = l->next) - { - const char *ssid; - - ssid = l->data; - - if (ssid) - { - return g_strdup (ssid); - } - } - - return NULL; -} - static gboolean do_add_session (UsersServiceDbus *service, UserData *user, @@ -1035,17 +1004,6 @@ users_service_dbus_get_user_list (UsersServiceDbus *self) return g_hash_table_get_values (priv->users); } -/* - * XXX - TODO: Right now we switch to a session that another user - * already has open, but if there are no open sessions - * for this user we go to the login screen and the - * user at the seat must select a user and enter a - * password. This kind of defeats the purpose of - * actually selecting a username, since selecting any - * user will do the same thing here. We need to change - * it so you only need to enter a password for the - * specified user. - */ gboolean users_service_dbus_activate_user_session (UsersServiceDbus *self, UserData *user) @@ -1054,32 +1012,20 @@ users_service_dbus_activate_user_session (UsersServiceDbus *self, DBusMessage *message = NULL; DBusMessage *reply = NULL; DBusError error; - gchar *ssid; dbus_error_init (&error); - if (!priv->seat) - priv->seat = get_seat (self); - - ssid = get_session_for_user (self, user); - - if (!ssid) - { - return start_new_user_session (self, user); - } - - if (!(message = dbus_message_new_method_call ("org.freedesktop.ConsoleKit", - priv->seat, - "org.freedesktop.ConsoleKit.Seat", - "ActivateSession"))) + if (!(message = dbus_message_new_method_call ("org.gnome.DisplayManager", + "/org/gnome/DisplayManager/LocalDisplayFactory", + "org.gnome.DisplayManager.LocalDisplayFactory", + "SwitchToUser"))) { g_warning ("failed to create new message"); return FALSE; } if (!dbus_message_append_args (message, - DBUS_TYPE_OBJECT_PATH, - &ssid, + DBUS_TYPE_STRING, &user->user_name, DBUS_TYPE_INVALID)) { g_warning ("failed to append args"); @@ -1110,6 +1056,8 @@ users_service_dbus_activate_user_session (UsersServiceDbus *self, dbus_message_unref (reply); } + dbus_error_free (&error); + return TRUE; } diff --git a/src/users-service-dbus.h b/src/users-service-dbus.h index 9ba05c9..41052f8 100644 --- a/src/users-service-dbus.h +++ b/src/users-service-dbus.h @@ -54,7 +54,7 @@ struct _UserData * got some gdm issues worked out. */ #define MINIMUM_USERS 1 -#define MAXIMUM_USERS 1 +#define MAXIMUM_USERS 7 struct _UsersServiceDbus { GObject parent; -- cgit v1.2.3 From 4a6f782262c2652585094d00458c83e22c0e147b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 10:47:17 -0600 Subject: 0.2.2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5ccc43d..1b4ecfa 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.1) +AM_INIT_AUTOMAKE(indicator-session, 0.2.2) AM_MAINTAINER_MODE -- cgit v1.2.3 From b1d66f9d77fa960d7e59353e1e33250060493ec6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 13:16:32 -0600 Subject: Refactoring so the menu is created in init. --- src/indicator-session.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index dda8c76..2017fff 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -51,6 +51,8 @@ struct _IndicatorSessionClass { struct _IndicatorSession { IndicatorObject parent; IndicatorServiceManager * service; + GtkImage * status_image; + GtkMenu * menu; }; GType indicator_session_get_type (void); @@ -96,6 +98,9 @@ indicator_session_init (IndicatorSession *self) /* Now let's fire these guys up. */ self->service = indicator_service_manager_new_version(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_VERSION); + self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU)); + self->menu = GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); + return; } @@ -130,9 +135,8 @@ get_label (IndicatorObject * io) static GtkImage * get_icon (IndicatorObject * io) { - GtkImage * status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU)); - gtk_widget_show(GTK_WIDGET(status_image)); - return status_image; + gtk_widget_show(GTK_WIDGET(INDICATOR_SESSION(io)->status_image)); + return INDICATOR_SESSION(io)->status_image; } /* Indicator based function to get the menu for the whole @@ -141,7 +145,7 @@ get_icon (IndicatorObject * io) static GtkMenu * get_menu (IndicatorObject * io) { - return GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); + return INDICATOR_SESSION(io)->menu; } -- cgit v1.2.3 From 70d29699c60a2507e457357a72eb484644f67dfd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 13:18:17 -0600 Subject: Woot, a dbusmenu, much better. --- src/indicator-session.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 2017fff..840965e 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -52,7 +52,7 @@ struct _IndicatorSession { IndicatorObject parent; IndicatorServiceManager * service; GtkImage * status_image; - GtkMenu * menu; + DbusmenuGtkMenu * menu; }; GType indicator_session_get_type (void); @@ -99,7 +99,7 @@ indicator_session_init (IndicatorSession *self) self->service = indicator_service_manager_new_version(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_VERSION); self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU)); - self->menu = GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); + self->menu = dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT); return; } @@ -145,7 +145,7 @@ get_icon (IndicatorObject * io) static GtkMenu * get_menu (IndicatorObject * io) { - return INDICATOR_SESSION(io)->menu; + return GTK_MENU(INDICATOR_SESSION(io)->menu); } -- cgit v1.2.3 From 51ac202d7332f31df4912290bb180e2b4a7d413d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 13:26:17 -0600 Subject: Building shared names for dbusmenu objects. --- src/Makefile.am | 2 ++ src/dbusmenu-shared.h | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 src/dbusmenu-shared.h diff --git a/src/Makefile.am b/src/Makefile.am index 2c607f5..fdbf466 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,7 @@ sessionlib_LTLIBRARIES = libsession.la libsession_la_SOURCES = \ indicator-session.c \ dbus-shared-names.h \ + dbusmenu-shared.h \ users-service-client.h libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libsession_la_LIBADD = $(APPLET_LIBS) @@ -42,6 +43,7 @@ indicator_session_service_SOURCES = \ lock-helper.c \ lock-helper.h \ session-service.c \ + dbusmenu-shared.h \ gtk-dialog/gconf-helper.c \ users-service-dbus.h \ users-service-dbus.c \ diff --git a/src/dbusmenu-shared.h b/src/dbusmenu-shared.h new file mode 100644 index 0000000..1ef179b --- /dev/null +++ b/src/dbusmenu-shared.h @@ -0,0 +1,4 @@ + +#define MENU_SWITCH_TYPE "x-canonical-switch-from" +#define MENU_SWITCH_USER "x-canonical-switch-username" + -- cgit v1.2.3 From 3ccc99e803d8a43bd932275b2e172cdcce213ad9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Feb 2010 14:43:29 -0500 Subject: included autogen.sh in EXTRA_DIST to make packagers happy --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0233fbf..3d97874 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = \ data \ po -EXTRA_DIST = COPYING.LGPL +EXTRA_DIST = COPYING.LGPL autogen.sh DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall -- cgit v1.2.3 From a36272659c9dbcff0c083a2083417ac65d876c3b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 14:53:20 -0600 Subject: Setting up the type handler --- src/indicator-session.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/indicator-session.c b/src/indicator-session.c index 840965e..a1f83d1 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -33,6 +33,7 @@ with this program. If not, see . #include #include "dbus-shared-names.h" +#include "dbusmenu-shared.h" #define INDICATOR_SESSION_TYPE (indicator_session_get_type ()) #define INDICATOR_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SESSION_TYPE, IndicatorSession)) @@ -65,6 +66,7 @@ INDICATOR_SET_TYPE(INDICATOR_SESSION_TYPE) static GtkLabel * get_label (IndicatorObject * io); static GtkImage * get_icon (IndicatorObject * io); static GtkMenu * get_menu (IndicatorObject * io); +static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); static void indicator_session_class_init (IndicatorSessionClass *klass); static void indicator_session_init (IndicatorSession *self); @@ -101,6 +103,9 @@ indicator_session_init (IndicatorSession *self) self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU)); self->menu = dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT); + DbusmenuClient * client = DBUSMENU_CLIENT(dbusmenu_gtkmenu_get_client(self->menu)); + dbusmenu_client_add_type_handler(client, MENU_SWITCH_TYPE, build_menu_switch); + return; } @@ -148,4 +153,13 @@ get_menu (IndicatorObject * io) return GTK_MENU(INDICATOR_SESSION(io)->menu); } +/* This function checks to see if the user name is short enough + to not need ellipsing itself, or if, it will get ellipsed by + the standard label processor. */ +static gboolean +build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +{ + + return FALSE; +} -- cgit v1.2.3 From 2398976ff0152f8cdbd1c2ec84663b33598abd7d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 16:08:36 -0600 Subject: Fleshing out the menu_switch function with a function that looks at the length of the label and sees if we need to ellipsize it or not. --- src/indicator-session.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/src/indicator-session.c b/src/indicator-session.c index a1f83d1..7e9bb45 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -22,6 +22,7 @@ with this program. If not, see . #include #include +#include #include #include @@ -153,13 +154,81 @@ get_menu (IndicatorObject * io) return GTK_MENU(INDICATOR_SESSION(io)->menu); } +static void +switch_property_change (DbusmenuMenuitem * item, const gchar * property, const GValue * value, gpointer user_data) +{ + if (g_strcmp0(property, MENU_SWITCH_USER) != 0) { + return; + } + + gchar * finalstring = NULL; + gboolean set_ellipsize = FALSE; + + /* If there's a NULL string of some type, then we want to + go back to our old 'Switch User' which isn't great but + eh, this error condition should never happen. */ + if (value == NULL || g_value_get_string(value) == NULL || g_value_get_string(value)[0] == '\0') { + finalstring = _("Switch User..."); + set_ellipsize = FALSE; + } + + if (finalstring == NULL) { + const gchar * username = g_value_get_string(value); + GtkWidget * off = gtk_offscreen_window_new(); + GtkWidget * label = gtk_label_new(username); + gtk_container_add(GTK_CONTAINER(off), label); + GdkPixmap * pixmap = gtk_offscreen_window_get_pixmap(GTK_OFFSCREEN_WINDOW(off)); + + gint width, height; + gdk_drawable_get_size(GDK_DRAWABLE(pixmap), &width, &height); + + GtkStyle * style = gtk_widget_get_style(label); /* TODO: Switch to menuitem label */ + gint point = pango_font_description_get_size(style->font_desc); + + gdouble dpi = gdk_screen_get_resolution(gdk_screen_get_default()); + + gdouble pixels_per_em = point * dpi / 72.0f; + gdouble ems = width / pixels_per_em; + + /* TODO: We need some way to remove the elipsis from appearing + twice in the label. Not sure how to do that yet. */ + finalstring = g_strdup_printf(_("Switch from %s..."), username); + if (ems >= 20.0f) { + set_ellipsize = TRUE; + } else { + set_ellipsize = FALSE; + } + } + + GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(DBUSMENU_GTKCLIENT(user_data), item); + gtk_menu_item_set_label(gmi, finalstring); + + GtkLabel * label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(gmi))); + if (label != NULL) { + if (set_ellipsize) { + gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_NONE); + } else { + gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_END); + } + } + + return; +} + + /* This function checks to see if the user name is short enough to not need ellipsing itself, or if, it will get ellipsed by the standard label processor. */ static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) { + GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); + /* TODO: Setup style update */ + + dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); + g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(switch_property_change), client); + switch_property_change(newitem, MENU_SWITCH_USER, dbusmenu_menuitem_property_get_value(newitem, MENU_SWITCH_USER), client); return FALSE; } -- cgit v1.2.3 From ccaa76fac008a5de7b8eacf3f70dfe96dd15ce16 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 16:12:01 -0600 Subject: Switching the menu item that we're creating. --- src/session-service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 3cbb29c..b414328 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -38,6 +38,7 @@ with this program. If not, see . #include #include "dbus-shared-names.h" +#include "dbusmenu-shared.h" #include "gtk-dialog/gconf-helper.h" @@ -481,9 +482,8 @@ rebuild_items (DbusmenuMenuitem *root, ensure_gconf_client (); switch_menuitem = dbusmenu_menuitem_new (); - gchar * switchlabel = g_strdup_printf(_("Switch from %s..."), g_get_user_name()); - dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, switchlabel); - g_free(switchlabel); + dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_TYPE, MENU_SWITCH_TYPE); + dbusmenu_menuitem_property_set (switch_menuitem, MENU_SWITCH_USER, g_get_user_name()); dbusmenu_menuitem_child_append (root, switch_menuitem); g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL); -- cgit v1.2.3 From 54cd89f665c38244b811508d5995010c9a9d08e0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 16:17:54 -0600 Subject: Get returns in better shape --- src/indicator-session.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 7e9bb45..f0ec5a4 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -223,6 +223,9 @@ static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) { GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); + if (gmi == NULL) { + return FALSE; + } /* TODO: Setup style update */ dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); @@ -230,5 +233,5 @@ build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusme g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(switch_property_change), client); switch_property_change(newitem, MENU_SWITCH_USER, dbusmenu_menuitem_property_get_value(newitem, MENU_SWITCH_USER), client); - return FALSE; + return TRUE; } -- cgit v1.2.3 From d2bc464709c47d37d110179c291a914fc989f148 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 16:22:51 -0600 Subject: Make sure to realize the offscreen window --- src/indicator-session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/indicator-session.c b/src/indicator-session.c index f0ec5a4..81453f2 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -177,6 +177,7 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G GtkWidget * off = gtk_offscreen_window_new(); GtkWidget * label = gtk_label_new(username); gtk_container_add(GTK_CONTAINER(off), label); + gtk_widget_realize(off); GdkPixmap * pixmap = gtk_offscreen_window_get_pixmap(GTK_OFFSCREEN_WINDOW(off)); gint width, height; -- cgit v1.2.3 From 5540e6c1c6321ec9c9d10060dc5917d842bcf08a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 20:37:28 -0600 Subject: Switching to using Pango to get the width --- src/indicator-session.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 81453f2..c685203 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -161,6 +161,7 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G return; } + GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(DBUSMENU_GTKCLIENT(user_data), item); gchar * finalstring = NULL; gboolean set_ellipsize = FALSE; @@ -174,22 +175,25 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G if (finalstring == NULL) { const gchar * username = g_value_get_string(value); - GtkWidget * off = gtk_offscreen_window_new(); - GtkWidget * label = gtk_label_new(username); - gtk_container_add(GTK_CONTAINER(off), label); - gtk_widget_realize(off); - GdkPixmap * pixmap = gtk_offscreen_window_get_pixmap(GTK_OFFSCREEN_WINDOW(off)); + GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(gmi)); /* TODO: Switch to menuitem label */ + + PangoLayout * layout = pango_layout_new(gtk_widget_get_pango_context(GTK_WIDGET(gmi))); + pango_layout_set_text(layout, username, -1); + pango_layout_set_font_description(layout, style->font_desc); gint width, height; - gdk_drawable_get_size(GDK_DRAWABLE(pixmap), &width, &height); + pango_layout_get_pixel_size(layout, &width, &height); + g_debug("Username width %dpx", width); - GtkStyle * style = gtk_widget_get_style(label); /* TODO: Switch to menuitem label */ gint point = pango_font_description_get_size(style->font_desc); + g_debug("Font size %d pt", point); gdouble dpi = gdk_screen_get_resolution(gdk_screen_get_default()); + g_debug("Screen DPI %f", dpi); gdouble pixels_per_em = point * dpi / 72.0f; gdouble ems = width / pixels_per_em; + g_debug("Username width %fem", ems); /* TODO: We need some way to remove the elipsis from appearing twice in the label. Not sure how to do that yet. */ @@ -201,7 +205,6 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G } } - GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(DBUSMENU_GTKCLIENT(user_data), item); gtk_menu_item_set_label(gmi, finalstring); GtkLabel * label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(gmi))); -- cgit v1.2.3 From 78fa67257e72eb43d2a4f4d82d51f881af8ad91c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 20:44:35 -0600 Subject: Calculating font size with PANGO_SCALE getting involved --- src/indicator-session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index c685203..f0232c6 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -181,17 +181,17 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G pango_layout_set_text(layout, username, -1); pango_layout_set_font_description(layout, style->font_desc); - gint width, height; - pango_layout_get_pixel_size(layout, &width, &height); + gint width; + pango_layout_get_pixel_size(layout, &width, NULL); g_debug("Username width %dpx", width); gint point = pango_font_description_get_size(style->font_desc); - g_debug("Font size %d pt", point); + g_debug("Font size %f pt", (gfloat)point / PANGO_SCALE); gdouble dpi = gdk_screen_get_resolution(gdk_screen_get_default()); g_debug("Screen DPI %f", dpi); - gdouble pixels_per_em = point * dpi / 72.0f; + gdouble pixels_per_em = ((point * dpi) / 72.0f) / PANGO_SCALE; gdouble ems = width / pixels_per_em; g_debug("Username width %fem", ems); -- cgit v1.2.3 From 93c4617240197202846fd9305f2154f885d17224 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 20:45:09 -0600 Subject: Fixing a value --- src/indicator-session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index f0232c6..9a5385e 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -210,9 +210,9 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G GtkLabel * label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(gmi))); if (label != NULL) { if (set_ellipsize) { - gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_NONE); - } else { gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_END); + } else { + gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_NONE); } } -- cgit v1.2.3 From a2cf14bc54d903dbc51557ff6d06e38f92714010 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 22:48:04 -0600 Subject: Adding in the ability to monitor style changes and re-evaluate. --- src/indicator-session.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 9a5385e..4dc3d11 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -219,6 +219,20 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G return; } +static const gchar * dbusmenu_item_data = "dbusmenu-item"; + +/* Callback for when the style changes so we can reevaluate the + size of the user name with the potentially new font. */ +static void +switch_style_set (GtkWidget * widget, GtkStyle * prev_style, gpointer user_data) +{ + DbusmenuGtkClient * client = DBUSMENU_GTKCLIENT(user_data); + DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(g_object_get_data(G_OBJECT(widget), dbusmenu_item_data)); + + switch_property_change(mi, MENU_SWITCH_USER, dbusmenu_menuitem_property_get_value(mi, MENU_SWITCH_USER), client); + return; +} + /* This function checks to see if the user name is short enough to not need ellipsing itself, or if, it will get ellipsed by @@ -230,11 +244,12 @@ build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusme if (gmi == NULL) { return FALSE; } - /* TODO: Setup style update */ + g_object_set_data(G_OBJECT(gmi), dbusmenu_item_data, newitem); dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(switch_property_change), client); + g_signal_connect(G_OBJECT(gmi), "style-set", G_CALLBACK(switch_style_set), client); switch_property_change(newitem, MENU_SWITCH_USER, dbusmenu_menuitem_property_get_value(newitem, MENU_SWITCH_USER), client); return TRUE; -- cgit v1.2.3 From c6661b02cfede0afff6102d7ebff656a166e0b29 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Feb 2010 22:48:43 -0600 Subject: Removing comment. --- src/indicator-session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 4dc3d11..1b9629b 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -175,7 +175,7 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G if (finalstring == NULL) { const gchar * username = g_value_get_string(value); - GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(gmi)); /* TODO: Switch to menuitem label */ + GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(gmi)); PangoLayout * layout = pango_layout_new(gtk_widget_get_pango_context(GTK_WIDGET(gmi))); pango_layout_set_text(layout, username, -1); -- cgit v1.2.3 From 07f36b8de87ccdaebee842105bd86892f6465d3d Mon Sep 17 00:00:00 2001 From: David Barth Date: Tue, 16 Feb 2010 19:40:23 +0100 Subject: add forgotten separator and re-order the user switch entry according to the spec --- src/session-service.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index e89a9a0..a2da207 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -437,6 +437,10 @@ rebuild_items (DbusmenuMenuitem *root, if (can_activate == TRUE) { + DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new(); + dbusmenu_menuitem_property_set(separator1, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); + dbusmenu_menuitem_child_append(root, separator1); + if (check_guest_session ()) { mi = dbusmenu_menuitem_new (); @@ -445,6 +449,25 @@ rebuild_items (DbusmenuMenuitem *root, g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL); } + if (check_new_session ()) + { + ensure_gconf_client (); + + switch_menuitem = dbusmenu_menuitem_new (); + dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User...")); + dbusmenu_menuitem_child_append (root, switch_menuitem); + g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL); + + if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY, NULL)) + { + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); + } + else + { + dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); + } + } + if (count > MINIMUM_USERS && count < MAXIMUM_USERS) { if (users != NULL) @@ -476,24 +499,6 @@ rebuild_items (DbusmenuMenuitem *root, } } - if (check_new_session ()) - { - ensure_gconf_client (); - - switch_menuitem = dbusmenu_menuitem_new (); - dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User...")); - dbusmenu_menuitem_child_append (root, switch_menuitem); - g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL); - - if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY, NULL)) - { - dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); - } - else - { - dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); - } - } } DbusmenuMenuitem * separator = dbusmenu_menuitem_new(); -- cgit v1.2.3 From b800d54c8ab32368153003cb61d1c00f9b76ccad Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 17 Feb 2010 11:03:06 +0100 Subject: Port from DeviceKit-power to upower --- src/session-service.c | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index e89a9a0..0d9552a 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -44,9 +44,9 @@ with this program. If not, see . #include "users-service-dbus.h" #include "lock-helper.h" -#define DKP_ADDRESS "org.freedesktop.DeviceKit.Power" -#define DKP_OBJECT "/org/freedesktop/DeviceKit/Power" -#define DKP_INTERFACE "org.freedesktop.DeviceKit.Power" +#define UP_ADDRESS "org.freedesktop.UPower" +#define UP_OBJECT "/org/freedesktop/UPower" +#define UP_INTERFACE "org.freedesktop.UPower" #define GUEST_SESSION_LAUNCHER "/usr/share/gdm/guest-session/guest-session-launch" @@ -72,8 +72,8 @@ static GList *users; static DbusmenuMenuitem * root_menuitem = NULL; static GMainLoop * mainloop = NULL; -static DBusGProxy * dkp_main_proxy = NULL; -static DBusGProxy * dkp_prop_proxy = NULL; +static DBusGProxy * up_main_proxy = NULL; +static DBusGProxy * up_prop_proxy = NULL; static DBusGProxyCall * suspend_call = NULL; static DBusGProxyCall * hibernate_call = NULL; @@ -147,14 +147,14 @@ machine_sleep (DbusmenuMenuitem * mi, guint timestamp, gpointer userdata) { gchar * type = (gchar *)userdata; - if (dkp_main_proxy == NULL) { - g_warning("Can not %s as no DeviceKit Power Proxy", type); + if (up_main_proxy == NULL) { + g_warning("Can not %s as no upower proxy", type); } screensaver_throttle(type); lock_screen(NULL, 0, NULL); - dbus_g_proxy_begin_call(dkp_main_proxy, + dbus_g_proxy_begin_call(up_main_proxy, type, sleep_response, NULL, @@ -213,17 +213,17 @@ hibernate_prop_cb (DBusGProxy * proxy, DBusGProxyCall * call, gpointer userdata) /* A signal that we need to recheck to ensure we can still hibernate and/or suspend */ static void -dpk_changed_cb (DBusGProxy * proxy, gpointer user_data) +up_changed_cb (DBusGProxy * proxy, gpointer user_data) { /* Start Async call to see if we can hibernate */ if (suspend_call == NULL) { - suspend_call = dbus_g_proxy_begin_call(dkp_prop_proxy, + suspend_call = dbus_g_proxy_begin_call(up_prop_proxy, "Get", suspend_prop_cb, NULL, NULL, G_TYPE_STRING, - DKP_INTERFACE, + UP_INTERFACE, G_TYPE_STRING, "can-suspend", G_TYPE_INVALID, @@ -233,13 +233,13 @@ dpk_changed_cb (DBusGProxy * proxy, gpointer user_data) /* Start Async call to see if we can suspend */ if (hibernate_call == NULL) { - hibernate_call = dbus_g_proxy_begin_call(dkp_prop_proxy, + hibernate_call = dbus_g_proxy_begin_call(up_prop_proxy, "Get", hibernate_prop_cb, NULL, NULL, G_TYPE_STRING, - DKP_INTERFACE, + UP_INTERFACE, G_TYPE_STRING, "can-hibernate", G_TYPE_INVALID, @@ -254,39 +254,39 @@ dpk_changed_cb (DBusGProxy * proxy, gpointer user_data) DKp checking. We're even setting up the calls for the props we need */ static void -setup_dkp (void) { +setup_up (void) { DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL); g_return_if_fail(bus != NULL); - if (dkp_main_proxy == NULL) { - dkp_main_proxy = dbus_g_proxy_new_for_name(bus, - DKP_ADDRESS, - DKP_OBJECT, - DKP_INTERFACE); + if (up_main_proxy == NULL) { + up_main_proxy = dbus_g_proxy_new_for_name(bus, + UP_ADDRESS, + UP_OBJECT, + UP_INTERFACE); } - g_return_if_fail(dkp_main_proxy != NULL); + g_return_if_fail(up_main_proxy != NULL); - if (dkp_prop_proxy == NULL) { - dkp_prop_proxy = dbus_g_proxy_new_for_name(bus, - DKP_ADDRESS, - DKP_OBJECT, + if (up_prop_proxy == NULL) { + up_prop_proxy = dbus_g_proxy_new_for_name(bus, + UP_ADDRESS, + UP_OBJECT, DBUS_INTERFACE_PROPERTIES); } - g_return_if_fail(dkp_prop_proxy != NULL); + g_return_if_fail(up_prop_proxy != NULL); /* Connect to changed signal */ - dbus_g_proxy_add_signal(dkp_main_proxy, + dbus_g_proxy_add_signal(up_main_proxy, "Changed", G_TYPE_INVALID); - dbus_g_proxy_connect_signal(dkp_main_proxy, + dbus_g_proxy_connect_signal(up_main_proxy, "Changed", - G_CALLBACK(dpk_changed_cb), + G_CALLBACK(up_changed_cb), NULL, NULL); /* Force an original "changed" event */ - dpk_changed_cb(dkp_main_proxy, NULL); + up_changed_cb(up_main_proxy, NULL); return; } @@ -639,7 +639,7 @@ main (int argc, char ** argv) G_CALLBACK (user_removed), root_menuitem); - setup_dkp(); + setup_up(); DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT); dbusmenu_server_set_root(server, root_menuitem); -- cgit v1.2.3 From fe30d5b4e43323cd8c85f15fcd25399396fdd30a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 23:14:50 -0600 Subject: Adding a status directory and icons for accounts that are logged in --- data/icons/16x16/Makefile.am | 2 +- data/icons/16x16/status/Makefile.am | 7 + data/icons/16x16/status/account-logged-in.png | Bin 0 -> 962 bytes data/icons/22x22/Makefile.am | 2 +- data/icons/22x22/status/Makefile.am | 7 + data/icons/22x22/status/account-logged-in.png | Bin 0 -> 1356 bytes data/icons/24x24/Makefile.am | 2 +- data/icons/24x24/status/Makefile.am | 7 + data/icons/24x24/status/account-logged-in.png | Bin 0 -> 1356 bytes data/icons/32x32/Makefile.am | 2 +- data/icons/32x32/status/Makefile.am | 7 + data/icons/32x32/status/account-logged-in.png | Bin 0 -> 2136 bytes data/icons/scalable/Makefile.am | 2 +- data/icons/scalable/status/Makefile.am | 7 + data/icons/scalable/status/account-logged-in.svg | 270 +++++++++++++++++++++++ 15 files changed, 310 insertions(+), 5 deletions(-) create mode 100644 data/icons/16x16/status/Makefile.am create mode 100644 data/icons/16x16/status/account-logged-in.png create mode 100644 data/icons/22x22/status/Makefile.am create mode 100644 data/icons/22x22/status/account-logged-in.png create mode 100644 data/icons/24x24/status/Makefile.am create mode 100644 data/icons/24x24/status/account-logged-in.png create mode 100644 data/icons/32x32/status/Makefile.am create mode 100644 data/icons/32x32/status/account-logged-in.png create mode 100644 data/icons/scalable/status/Makefile.am create mode 100644 data/icons/scalable/status/account-logged-in.svg diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am index 0224d45..c163076 100644 --- a/data/icons/16x16/Makefile.am +++ b/data/icons/16x16/Makefile.am @@ -1 +1 @@ -SUBDIRS = actions +SUBDIRS = actions status diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am new file mode 100644 index 0000000..c0af60e --- /dev/null +++ b/data/icons/16x16/status/Makefile.am @@ -0,0 +1,7 @@ + +iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status + +icons_DATA = \ + account-logged-in.png + +EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/16x16/status/account-logged-in.png b/data/icons/16x16/status/account-logged-in.png new file mode 100644 index 0000000..fb4362c Binary files /dev/null and b/data/icons/16x16/status/account-logged-in.png differ diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am index 0224d45..c163076 100644 --- a/data/icons/22x22/Makefile.am +++ b/data/icons/22x22/Makefile.am @@ -1 +1 @@ -SUBDIRS = actions +SUBDIRS = actions status diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am new file mode 100644 index 0000000..1ce0fa1 --- /dev/null +++ b/data/icons/22x22/status/Makefile.am @@ -0,0 +1,7 @@ + +iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status + +icons_DATA = \ + account-logged-in.png + +EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/22x22/status/account-logged-in.png b/data/icons/22x22/status/account-logged-in.png new file mode 100644 index 0000000..e27d75f Binary files /dev/null and b/data/icons/22x22/status/account-logged-in.png differ diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am index 0224d45..c163076 100644 --- a/data/icons/24x24/Makefile.am +++ b/data/icons/24x24/Makefile.am @@ -1 +1 @@ -SUBDIRS = actions +SUBDIRS = actions status diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am new file mode 100644 index 0000000..4fa065a --- /dev/null +++ b/data/icons/24x24/status/Makefile.am @@ -0,0 +1,7 @@ + +iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status + +icons_DATA = \ + account-logged-in.png + +EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/24x24/status/account-logged-in.png b/data/icons/24x24/status/account-logged-in.png new file mode 100644 index 0000000..db4f548 Binary files /dev/null and b/data/icons/24x24/status/account-logged-in.png differ diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am index 0224d45..c163076 100644 --- a/data/icons/32x32/Makefile.am +++ b/data/icons/32x32/Makefile.am @@ -1 +1 @@ -SUBDIRS = actions +SUBDIRS = actions status diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am new file mode 100644 index 0000000..b852725 --- /dev/null +++ b/data/icons/32x32/status/Makefile.am @@ -0,0 +1,7 @@ + +iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status + +icons_DATA = \ + account-logged-in.png + +EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/32x32/status/account-logged-in.png b/data/icons/32x32/status/account-logged-in.png new file mode 100644 index 0000000..05bff57 Binary files /dev/null and b/data/icons/32x32/status/account-logged-in.png differ diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index 0224d45..c163076 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -1 +1 @@ -SUBDIRS = actions +SUBDIRS = actions status diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am new file mode 100644 index 0000000..cb006e2 --- /dev/null +++ b/data/icons/scalable/status/Makefile.am @@ -0,0 +1,7 @@ + +iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status + +icons_DATA = \ + account-logged-in.svg + +EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/scalable/status/account-logged-in.svg b/data/icons/scalable/status/account-logged-in.svg new file mode 100644 index 0000000..c3ef44f --- /dev/null +++ b/data/icons/scalable/status/account-logged-in.svg @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Emblem Urgent + + + Jakub Steiner + + + + + Andreas Nilsson + + + + + + generic + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From de76d333676d3c04a00d48ff5c57f7bff031f399 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 23:16:26 -0600 Subject: Building the make files --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 1b4ecfa..b401694 100644 --- a/configure.ac +++ b/configure.ac @@ -132,14 +132,19 @@ data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/actions/Makefile +data/icons/16x16/status/Makefile data/icons/22x22/Makefile data/icons/22x22/actions/Makefile +data/icons/22x22/status/Makefile data/icons/24x24/Makefile data/icons/24x24/actions/Makefile +data/icons/24x24/status/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile +data/icons/32x32/status/Makefile data/icons/scalable/Makefile data/icons/scalable/actions/Makefile +data/icons/scalable/status/Makefile po/Makefile.in ]) -- cgit v1.2.3 From 59c5e7039b4549c2e7e7a4052c0a3f9407961357 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 23:20:23 -0600 Subject: Adding in some defines for our new menu type. --- src/dbus-shared-names.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 1fd256f..253cba8 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -38,4 +38,8 @@ with this program. If not, see . #define INDICATOR_SESSION_DBUS_OBJECT "/org/ayatana/indicator/session/menu" #define INDICATOR_SESSION_DBUS_VERSION 0 +#define USER_ITEM_TYPE "x-canonical-user-item" +#define USER_ITEM_PROP_NAME "user-item-name" +#define USER_ITEM_PROP_LOGGED_IN "user-item-logged-in" + #endif /* __DBUS_SHARED_NAMES_H__ */ -- cgit v1.2.3 From 765a3b87d9812680615dcb7278e16fea8f0fa1d1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 23:24:09 -0600 Subject: Registering a handler for our new type --- src/indicator-session.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index dda8c76..d931bcd 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -135,13 +135,25 @@ get_icon (IndicatorObject * io) return status_image; } +static gboolean +new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +{ + + return FALSE; +} + /* Indicator based function to get the menu for the whole applet. This starts up asking for the parts of the menu from the various services. */ static GtkMenu * get_menu (IndicatorObject * io) { - return GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); + DbusmenuGtkMenu * menu = dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT); + DbusmenuGtkClient * client = dbusmenu_gtkmenu_get_client(menu); + + dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), USER_ITEM_TYPE, new_user_item); + + return GTK_MENU(menu); } -- cgit v1.2.3 From 7723397ac8f8f5875ffac86f007b9321a503a846 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 23:36:13 -0600 Subject: Fleshing out the building of the user item --- src/indicator-session.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index d931bcd..a39e4a0 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -135,11 +135,33 @@ get_icon (IndicatorObject * io) return status_image; } +/* Builds an item with a hip little logged in icon. */ static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) { + GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); + GtkWidget * hbox = gtk_hbox_new(FALSE, 0); + + GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, USER_ITEM_PROP_NAME)); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + GtkWidget * icon = gtk_image_new_from_icon_name("account-logged-in", GTK_ICON_SIZE_MENU); + gtk_misc_set_alignment(GTK_MISC(icon), 1.0, 0.5); + gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0); + if (dbusmenu_menuitem_property_get_bool(newitem, USER_ITEM_PROP_LOGGED_IN)) { + gtk_widget_show(icon); + } else { + gtk_widget_hide(icon); + } + + gtk_container_add(GTK_CONTAINER(gmi), hbox); + gtk_widget_show(hbox); + + dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); - return FALSE; + return TRUE; } /* Indicator based function to get the menu for the whole -- cgit v1.2.3 From 6868e64c17ba4aea5f8aa22b84a6518119b6754e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 23:39:11 -0600 Subject: Switching the guest over to a user item. --- src/session-service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index 3303317..fed4446 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -444,7 +444,9 @@ rebuild_items (DbusmenuMenuitem *root, if (check_guest_session ()) { mi = dbusmenu_menuitem_new (); - dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Guest Session")); + dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE); + dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, _("Guest Session")); + dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, FALSE); dbusmenu_menuitem_child_append (root, mi); g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL); } -- cgit v1.2.3 From 4a297fec6d7fbc75035aa7d3d1eedb90bea98d15 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 23:42:54 -0600 Subject: Switching users over to user items --- src/session-service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index fed4446..1a01174 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -495,7 +495,9 @@ rebuild_items (DbusmenuMenuitem *root, user->service = service; mi = dbusmenu_menuitem_new (); - dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_LABEL, user->real_name); + dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE); + dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name); + dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL); dbusmenu_menuitem_child_append (root, mi); g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user); } -- cgit v1.2.3 From db48c78c85af5ba8380ad147ba8576fd4d878c6f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Feb 2010 09:39:20 -0600 Subject: adding prototype for new user item --- src/indicator-session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/indicator-session.c b/src/indicator-session.c index ee7d76c..a97eb95 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -68,6 +68,7 @@ static GtkLabel * get_label (IndicatorObject * io); static GtkImage * get_icon (IndicatorObject * io); static GtkMenu * get_menu (IndicatorObject * io); static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); +static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); static void indicator_session_class_init (IndicatorSessionClass *klass); static void indicator_session_init (IndicatorSession *self); -- cgit v1.2.3 From e07cdb88407dc186d7cdb236e410b6ae9c4fc3f8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Feb 2010 09:39:50 -0600 Subject: 0.2.3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b401694..221da2c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.2) +AM_INIT_AUTOMAKE(indicator-session, 0.2.3) AM_MAINTAINER_MODE -- cgit v1.2.3 From bb88b769afb2a7b667919dd52de1d51ab60aaacf Mon Sep 17 00:00:00 2001 From: David Barth Date: Fri, 19 Feb 2010 13:28:45 +0100 Subject: prevent crash in g_error when gdm is not running --- src/users-service-dbus.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index d377089..0e5c922 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */ /* * Copyright 2009 Canonical Ltd. * @@ -183,7 +184,8 @@ users_service_dbus_init (UsersServiceDbus *self) create_ck_proxy (self); create_seat_proxy (self); - users_loaded (priv->gdm_proxy, self); + if (priv->gdm_proxy) + users_loaded (priv->gdm_proxy, self); } static void @@ -214,7 +216,7 @@ create_gdm_proxy (UsersServiceDbus *self) { if (error != NULL) { - g_error ("Unable to get DisplayManager proxy on system bus: %s", error->message); + g_warning ("Unable to get DisplayManager proxy on system bus: %s", error->message); g_error_free (error); } @@ -679,6 +681,8 @@ users_loaded (DBusGProxy *proxy, GError *error = NULL; gint count; + g_return_if_fail (proxy != NULL); + service = (UsersServiceDbus *)user_data; priv = USERS_SERVICE_DBUS_GET_PRIVATE (service); @@ -859,6 +863,8 @@ gboolean start_new_user_session (UsersServiceDbus *self, UserData *user) { + g_return_val_if_fail (IS_USERS_SERVICE_DBUS (self), FALSE); + UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self); GError *error = NULL; char *ssid; -- cgit v1.2.3 From 0c8dbfc17a82b877ec38e72fcfef1a6bdf2ab8ca Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Feb 2010 11:10:21 -0600 Subject: Removing the old logout dialog. It's been through too much, better to start over. --- src/gtk-dialog/logout-dialog.c | 371 ----------------------------------------- src/gtk-dialog/logout-dialog.h | 99 ----------- 2 files changed, 470 deletions(-) delete mode 100644 src/gtk-dialog/logout-dialog.c delete mode 100644 src/gtk-dialog/logout-dialog.h diff --git a/src/gtk-dialog/logout-dialog.c b/src/gtk-dialog/logout-dialog.c deleted file mode 100644 index 65df9fe..0000000 --- a/src/gtk-dialog/logout-dialog.c +++ /dev/null @@ -1,371 +0,0 @@ -/* - * libgksuui -- Gtk+ widget and convenience functions for requesting passwords - * Copyright (C) 2004 Gustavo Noronha Silva - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - */ - -#include -#include - -#include -#include -#include -#include - -#include "logout-dialog.h" -#include "ck-pk-helper.h" - -enum { - PROP_ZERO, - PROP_ACTION -}; - - -static void -logout_dialog_class_init (LogoutDialogClass *klass); - -static void -logout_dialog_init (LogoutDialog *logout_dialog); - -static void -set_property (GObject * object, guint param_id, const GValue * value, GParamSpec *pspec); - -static void -get_property (GObject * object, guint param_id, GValue * value, GParamSpec *pspec); - -static gboolean -timer_cb (gpointer data); - -static void -show_cb (GtkWidget * widget, gpointer data); - -static void -check_restart (LogoutDialog * dialog); - -static gchar* -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") -}; - -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") -}; - -static const gchar * restart_auth = N_("Restart..."); - -static const gchar * body_logout_update = N_("You recently installed updates which will only take effect after a restart. Restart to apply software updates."); - -static const gchar * icon_strings[LOGOUT_DIALOG_ACTION_CNT] = { - /* LOGOUT_DIALOG_LOGOUT, */ "system-log-out", - /* LOGOUT_DIALOG_RESTART, */ "system-restart", - /* LOGOUT_DIALOG_SHUTDOWN, */ "system-shutdown" -}; - -GType -logout_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) - { - static const GTypeInfo info = - { - sizeof (LogoutDialogClass), /* size of class */ - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) logout_dialog_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (LogoutDialog), /* size of object */ - 0, /* n_preallocs */ - (GInstanceInitFunc) logout_dialog_init /* instance_init */ - }; - type = g_type_register_static (gtk_dialog_get_type (), - "LogoutDialogType", - &info, 0); - } - - return type; -} - -static gchar* -get_plural_string (LogoutDialog * dialog) -{ - static gchar *plural_string = ""; - - switch (dialog->action) - { - case LOGOUT_DIALOG_LOGOUT: - plural_string = ngettext("You will be logged out in %d second.", - "You will be logged out in %d seconds.", - dialog->timeout); - break; - case LOGOUT_DIALOG_RESTART: - plural_string = ngettext("The computer will restart in %d second.", - "The computer will restart in %d seconds.", - 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.", - dialog->timeout); - break; - default: - break; - } - - return plural_string; -} - -static void -logout_dialog_class_init (LogoutDialogClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->set_property = set_property; - gobject_class->get_property = get_property; - - g_object_class_install_property(gobject_class, PROP_ACTION, - g_param_spec_int("action", NULL, NULL, - LOGOUT_DIALOG_LOGOUT, LOGOUT_DIALOG_SHUTDOWN, - LOGOUT_DIALOG_LOGOUT, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - - return; -} - -static void -set_property (GObject * object, guint param_id, const GValue * value, GParamSpec *pspec) -{ - g_return_if_fail(param_id == PROP_ACTION); - - LogoutDialog * dialog = LOGOUT_DIALOG(object); - dialog->action = (LogoutDialogAction)g_value_get_int(value); - - gtk_image_set_from_icon_name(GTK_IMAGE(dialog->image), icon_strings[dialog->action], GTK_ICON_SIZE_DIALOG); - gtk_window_set_title (GTK_WINDOW(dialog), _(title_strings[dialog->action])); - gtk_window_set_icon_name (GTK_WINDOW(dialog), icon_strings[dialog->action]); - gtk_widget_hide(dialog->message); - gtk_button_set_label(GTK_BUTTON(dialog->ok_button), _(button_strings[dialog->action])); - - gchar * timeouttxt = g_strdup_printf(get_plural_string(dialog), dialog->timeout); - gtk_label_set_text(GTK_LABEL(dialog->timeout_text), timeouttxt); - g_free(timeouttxt); - - check_restart(dialog); - - return; -} - -static void -get_property (GObject * object, guint param_id, GValue * value, GParamSpec *pspec) -{ - g_return_if_fail(param_id == PROP_ACTION); - g_value_set_int(value, LOGOUT_DIALOG(object)->action); -} - -static gboolean -timer_cb (gpointer data) -{ - LogoutDialog * dialog = LOGOUT_DIALOG(data); - - if (dialog->timeout == 0) { - gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); - dialog->timerfunc = 0; - return FALSE; - } else { - dialog->timeout--; - - gchar * timeouttxt = g_strdup_printf(get_plural_string(dialog), dialog->timeout); - gtk_label_set_text(GTK_LABEL(dialog->timeout_text), timeouttxt); - g_free(timeouttxt); - } - - return TRUE; -} - -static void -show_cb (GtkWidget * widget, gpointer data) -{ - LogoutDialog * dialog = LOGOUT_DIALOG(widget); - - if (dialog->timerfunc != 0) { - g_source_remove(dialog->timerfunc); - dialog->timerfunc = 0; - } - - dialog->timerfunc = g_timeout_add_seconds(1, timer_cb, dialog); - return; -} - -static void -check_restart (LogoutDialog * dialog) -{ - if (dialog->action != LOGOUT_DIALOG_LOGOUT) { - return; - } - - if (g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS)) { - if (pk_can_do_action("org.freedesktop.consolekit.system.restart", NULL) || - pk_can_do_action("org.freedesktop.consolekit.system.restart-multiple-users", NULL)) { - - gtk_label_set_text(GTK_LABEL(dialog->message), _(body_logout_update)); - gtk_widget_show(dialog->message); - if (pk_require_auth(LOGOUT_DIALOG_RESTART)) { - gtk_button_set_label(GTK_BUTTON(dialog->restart_button), _(restart_auth)); - } else { - gtk_button_set_label(GTK_BUTTON(dialog->restart_button), _(button_strings[LOGOUT_DIALOG_RESTART])); - } - gtk_widget_show(dialog->restart_button); - } - } - - return; -} - -static gboolean -focus_out_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data) -{ - gtk_window_present (GTK_WINDOW(widget)); - return TRUE; -} - -static void -logout_dialog_init (LogoutDialog *logout_dialog) -{ - GtkDialog *dialog; - gint border_width = 6; - - logout_dialog->timeout = 60; - logout_dialog->timerfunc = 0; - - /* dialog window */ - dialog = GTK_DIALOG(logout_dialog); - - /* make sure that our window will always have the focus */ - g_signal_connect (G_OBJECT(dialog), "focus-out-event", - G_CALLBACK(focus_out_cb), NULL); - - logout_dialog->main_vbox = dialog->vbox; - - gtk_window_set_title (GTK_WINDOW(logout_dialog), ""); - gtk_dialog_set_has_separator (GTK_DIALOG(logout_dialog), FALSE); - gtk_container_set_border_width (GTK_CONTAINER(logout_dialog), border_width); - gtk_box_set_spacing (GTK_BOX(logout_dialog->main_vbox), 12); - gtk_window_set_resizable (GTK_WINDOW(logout_dialog), FALSE); - - gtk_window_stick(GTK_WINDOW(logout_dialog)); - gtk_window_set_keep_above(GTK_WINDOW(logout_dialog), TRUE); - 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); - - /* the action buttons */ - /* the cancel button */ - logout_dialog->restart_button = gtk_dialog_add_button (dialog, - GTK_STOCK_HELP, - GTK_RESPONSE_HELP); - gtk_button_set_label(GTK_BUTTON(logout_dialog->restart_button), _(button_strings[LOGOUT_DIALOG_RESTART])); - gtk_widget_hide(logout_dialog->restart_button); - - /* the cancel button */ - logout_dialog->cancel_button = gtk_dialog_add_button (dialog, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - /* the ok button */ - logout_dialog->ok_button = gtk_dialog_add_button (dialog, - GTK_STOCK_OK, - GTK_RESPONSE_OK); - gtk_widget_grab_default (logout_dialog->ok_button); - - /* Window Title and Icon */ - gtk_window_set_title (GTK_WINDOW(logout_dialog), _(title_strings[logout_dialog->action])); - gtk_window_set_icon_name (GTK_WINDOW(logout_dialog), icon_strings[logout_dialog->action]); - - /* hbox */ - logout_dialog->hbox = gtk_hbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER(logout_dialog->hbox), 6); - gtk_box_pack_start (GTK_BOX(logout_dialog->main_vbox), - logout_dialog->hbox, FALSE, FALSE, 0); - gtk_widget_show (logout_dialog->hbox); - - /* image */ - logout_dialog->image = - gtk_image_new_from_icon_name (icon_strings[logout_dialog->action], - GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC(logout_dialog->image), 0.5, 0); - gtk_box_pack_start (GTK_BOX(logout_dialog->hbox), logout_dialog->image, - FALSE, FALSE, 0); - gtk_widget_show (logout_dialog->image); - - /* vbox for text */ - logout_dialog->vbox_text = gtk_vbox_new(FALSE, 12); - gtk_box_pack_start(GTK_BOX(logout_dialog->hbox), logout_dialog->vbox_text, TRUE, TRUE, 0); - gtk_widget_show(logout_dialog->vbox_text); - - /* Message */ - logout_dialog->message = gtk_label_new(""); - gtk_label_set_line_wrap(GTK_LABEL(logout_dialog->message), TRUE); - gtk_label_set_single_line_mode(GTK_LABEL(logout_dialog->message), FALSE); - gtk_label_set_selectable(GTK_LABEL(logout_dialog->message), TRUE); - gtk_misc_set_alignment (GTK_MISC(logout_dialog->message), 0.0, 0.0); - gtk_box_pack_start(GTK_BOX(logout_dialog->vbox_text), logout_dialog->message, TRUE, TRUE, 0); - gtk_widget_show(logout_dialog->message); - - /* timeout */ - logout_dialog->timeout_text = gtk_label_new(""); - gtk_label_set_line_wrap(GTK_LABEL(logout_dialog->timeout_text), TRUE); - gtk_label_set_single_line_mode(GTK_LABEL(logout_dialog->timeout_text), FALSE); - gtk_label_set_selectable(GTK_LABEL(logout_dialog->timeout_text), FALSE); - gtk_misc_set_alignment (GTK_MISC(logout_dialog->timeout_text), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(logout_dialog->vbox_text), logout_dialog->timeout_text, TRUE, TRUE, 0); - gtk_widget_show(logout_dialog->timeout_text); - - g_signal_connect(G_OBJECT(logout_dialog), "show", G_CALLBACK(show_cb), logout_dialog); - - return; -} - -/** - * logout_dialog_new: - * - * Creates a new #LogoutDialog. - * - * Returns: the new #LogoutDialog - */ -GtkWidget* -logout_dialog_new (LogoutDialogAction action) -{ - LogoutDialog * dialog = g_object_new (LOGOUT_TYPE_DIALOG, "action", action, NULL); - return GTK_WIDGET(dialog); -} - -LogoutDialogAction -logout_dialog_get_action (LogoutDialog * dialog) -{ - return dialog->action; -} - diff --git a/src/gtk-dialog/logout-dialog.h b/src/gtk-dialog/logout-dialog.h deleted file mode 100644 index 8b0ff09..0000000 --- a/src/gtk-dialog/logout-dialog.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * libgksuui -- Gtk+ widget and convenience functions for requesting passwords - * Copyright (C) 2004 Gustavo Noronha Silva - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - */ - -#ifndef __LOGOUT_DIALOG_H__ -#define __LOGOUT_DIALOG_H__ - -#include - -G_BEGIN_DECLS - -#define LOGOUT_TYPE_DIALOG (logout_dialog_get_type ()) -#define LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LOGOUT_TYPE_DIALOG, LogoutDialog)) -#define LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LOGOUT_TYPE_DIALOG, LogoutDialogClass)) -#define LOGOUT_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LOGOUT_TYPE_DIALOG)) -#define LOGOUT_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_TYPE_CONTEXT)) -#define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_TYPE_DIALOG, LogoutDialogClass)) - -typedef struct _LogoutDialogClass LogoutDialogClass; -typedef struct _LogoutDialog LogoutDialog; -typedef enum _LogoutDialogAction LogoutDialogAction; - -enum _LogoutDialogAction { - LOGOUT_DIALOG_LOGOUT, - LOGOUT_DIALOG_RESTART, - LOGOUT_DIALOG_SHUTDOWN, - LOGOUT_DIALOG_ACTION_CNT -}; - -struct _LogoutDialogClass -{ - GtkDialogClass parent_class; -}; - -/** - * LogoutDialog: - * @dialog: parent widget - * @main_vbox: GtkDialog's vbox - * @hbox: box to separate the image of the right-side widgets - * @image: the authorization image, left-side widget - * @entry_vbox: right-side widgets container - * @label: message describing what is required from the user, - * right-side widget - * @entry: place to type the password in, right-side widget - * @ok_button: OK button of the dialog - * @cancel_button: Cancel button of the dialog - * - * Convenience widget based on #GtkDialog to request a password. - */ -struct _LogoutDialog -{ - GtkDialog dialog; - - GtkWidget *main_vbox; - GtkWidget *hbox; - GtkWidget *image; - GtkWidget *ok_button; - GtkWidget *cancel_button; - GtkWidget *restart_button; - GtkWidget *vbox_text; - GtkWidget *message; - GtkWidget *timeout_text; - - LogoutDialogAction action; - - /* private */ - gchar * timeout_result; - guint timeout; - guint timerfunc; -}; - -GType -logout_dialog_get_type (void); - -GtkWidget* -logout_dialog_new (LogoutDialogAction action); - -LogoutDialogAction -logout_dialog_get_action (LogoutDialog * widget); - -G_END_DECLS - -#endif -- cgit v1.2.3 From c96dfa4fcf905cdf73b02589b2c64b83849160a6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Feb 2010 11:33:18 -0600 Subject: Place holder new object --- src/gtk-dialog/Makefile.am | 4 ++-- src/gtk-dialog/dialog.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ src/gtk-dialog/dialog.h | 31 +++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 src/gtk-dialog/dialog.c create mode 100644 src/gtk-dialog/dialog.h diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am index 3f14d78..2c7e61a 100644 --- a/src/gtk-dialog/Makefile.am +++ b/src/gtk-dialog/Makefile.am @@ -7,8 +7,8 @@ gtk_logout_helper_SOURCES = \ ck-pk-helper.h \ gconf-helper.c \ gconf-helper.h \ - logout-dialog.c \ - logout-dialog.h + dialog.c \ + dialog.h gtk_logout_helper_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" gtk_logout_helper_LDADD = $(SESSIONSERVICE_LIBS) $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS) diff --git a/src/gtk-dialog/dialog.c b/src/gtk-dialog/dialog.c new file mode 100644 index 0000000..c9d66b3 --- /dev/null +++ b/src/gtk-dialog/dialog.c @@ -0,0 +1,58 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "dialog.h" + +typedef struct _LogoutDialogPrivate LogoutDialogPrivate; +struct _LogoutDialogPrivate { + guint type; +}; + +#define LOGOUT_DIALOG_GET_PRIVATE(o) \ +(G_TYPE_INSTANCE_GET_PRIVATE ((o), LOGOUT_DIALOG_TYPE, LogoutDialogPrivate)) + +static void logout_dialog_class_init (LogoutDialogClass *klass); +static void logout_dialog_init (LogoutDialog *self); +static void logout_dialog_dispose (GObject *object); +static void logout_dialog_finalize (GObject *object); + +G_DEFINE_TYPE (LogoutDialog, logout_dialog, GTK_TYPE_DIALOG); + +static void +logout_dialog_class_init (LogoutDialogClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (LogoutDialogPrivate)); + + object_class->dispose = logout_dialog_dispose; + object_class->finalize = logout_dialog_finalize; + + return; +} + +static void +logout_dialog_init (LogoutDialog *self) +{ + + return; +} + +static void +logout_dialog_dispose (GObject *object) +{ + + + G_OBJECT_CLASS (logout_dialog_parent_class)->dispose (object); + return; +} + +static void +logout_dialog_finalize (GObject *object) +{ + + + G_OBJECT_CLASS (logout_dialog_parent_class)->finalize (object); + return; +} diff --git a/src/gtk-dialog/dialog.h b/src/gtk-dialog/dialog.h new file mode 100644 index 0000000..eeb93ed --- /dev/null +++ b/src/gtk-dialog/dialog.h @@ -0,0 +1,31 @@ +#ifndef __LOGOUT_DIALOG_H__ +#define __LOGOUT_DIALOG_H__ + +#include +#include + +G_BEGIN_DECLS + +#define LOGOUT_DIALOG_TYPE (logout_dialog_get_type ()) +#define LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOGOUT_DIALOG_TYPE, LogoutDialog)) +#define LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LOGOUT_DIALOG_TYPE, LogoutDialogClass)) +#define IS_LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LOGOUT_DIALOG_TYPE)) +#define IS_LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_DIALOG_TYPE)) +#define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_DIALOG_TYPE, LogoutDialogClass)) + +typedef struct _LogoutDialog LogoutDialog; +typedef struct _LogoutDialogClass LogoutDialogClass; + +struct _LogoutDialogClass { + GtkDialogClass parent_class; +}; + +struct _LogoutDialog { + GtkDialog parent; +}; + +GType logout_dialog_get_type (void); + +G_END_DECLS + +#endif -- cgit v1.2.3 From 7636e191ecf68f41ef28ae5e8811467e993aa108 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Feb 2010 16:55:45 -0600 Subject: Changed names to patch current upower --- src/session-service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 9fb9ee7..289bff8 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -226,7 +226,7 @@ up_changed_cb (DBusGProxy * proxy, gpointer user_data) G_TYPE_STRING, UP_INTERFACE, G_TYPE_STRING, - "can-suspend", + "CanSuspend", G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID); @@ -242,7 +242,7 @@ up_changed_cb (DBusGProxy * proxy, gpointer user_data) G_TYPE_STRING, UP_INTERFACE, G_TYPE_STRING, - "can-hibernate", + "CanHibernate", G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID); -- cgit v1.2.3 From 02ab93a720729796e63b66a521edd647c26182cb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Feb 2010 11:26:24 -0600 Subject: Adding a fallback for now gnome-session detected. --- src/gtk-dialog/gtk-logout-helper.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index d8aea6b..29f0add 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -29,6 +29,33 @@ with this program. If not, see . #include "ck-pk-helper.h" #include "gconf-helper.h" +static void +consolekit_fallback (LogoutDialogAction action) +{ + DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL); + g_return_if_fail(sbus != NULL); /* worst case */ + DBusGProxy * proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit", + "/org/freedesktop/ConsoleKit/Manager", + "org.freedesktop.ConsoleKit.Manager"); + + if (proxy == NULL) { + g_warning("Unable to get consolekit proxy"); + return; + } + + 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; + } + default: + g_warning("Unknown action"); + break; + } + + g_object_unref(proxy); +} + static void session_action (LogoutDialogAction action) { @@ -50,6 +77,8 @@ session_action (LogoutDialogAction action) if (sm_proxy == NULL) { g_warning("Unable to get DBus proxy to SessionManager interface: %s", error->message); g_error_free(error); + + consolekit_fallback(action); return; } -- cgit v1.2.3 From 8985b002f45ca55cabf32225c7a483ea36905c86 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Feb 2010 11:39:50 -0600 Subject: Adding in shutdown and restart --- src/gtk-dialog/gtk-logout-helper.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index 29f0add..4c6614c 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -44,16 +44,27 @@ consolekit_fallback (LogoutDialogAction action) } switch (action) { - case LOGOUT_DIALOG_LOGOUT: { + 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_call_no_reply(proxy, + "Stop", + G_TYPE_INVALID); + break; + case LOGOUT_DIALOG_RESTART: + dbus_g_proxy_call_no_reply(proxy, + "Restart", + G_TYPE_INVALID); + break; default: g_warning("Unknown action"); break; } g_object_unref(proxy); + + return; } static void -- cgit v1.2.3 From 40e989fdb054344be699414ae040585f4f87f657 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Feb 2010 17:12:55 -0600 Subject: Adding some types of dialog and a new function. --- src/gtk-dialog/dialog.c | 7 +++++++ src/gtk-dialog/dialog.h | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/src/gtk-dialog/dialog.c b/src/gtk-dialog/dialog.c index c9d66b3..06b146c 100644 --- a/src/gtk-dialog/dialog.c +++ b/src/gtk-dialog/dialog.c @@ -56,3 +56,10 @@ logout_dialog_finalize (GObject *object) G_OBJECT_CLASS (logout_dialog_parent_class)->finalize (object); return; } + +LogoutDialog * +logout_dialog_new (LogoutDialogType type) +{ + + return NULL; +} diff --git a/src/gtk-dialog/dialog.h b/src/gtk-dialog/dialog.h index eeb93ed..79c8a05 100644 --- a/src/gtk-dialog/dialog.h +++ b/src/gtk-dialog/dialog.h @@ -13,6 +13,13 @@ G_BEGIN_DECLS #define IS_LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_DIALOG_TYPE)) #define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_DIALOG_TYPE, LogoutDialogClass)) +typedef enum _LogoutDialogType LogoutDialogType; +enum _LogoutDialogType { + LOGOUT_DIALOG_TYPE_LOG_OUT, + LOGOUT_DIALOG_TYPE_RESTART, + LOGOUT_DIALOG_TYPE_SHUTDOWN +}; + typedef struct _LogoutDialog LogoutDialog; typedef struct _LogoutDialogClass LogoutDialogClass; @@ -25,6 +32,7 @@ struct _LogoutDialog { }; GType logout_dialog_get_type (void); +LogoutDialog * logout_dialog_new (LogoutDialogType type); G_END_DECLS -- cgit v1.2.3 From 64602f8dd39b0fd35b0bfc6697fe62bd7a2de0ad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Feb 2010 17:16:14 -0600 Subject: Changing to new enums and function prototypes. --- src/gtk-dialog/ck-pk-helper.c | 10 +++++----- src/gtk-dialog/ck-pk-helper.h | 2 +- src/gtk-dialog/dialog.h | 2 ++ src/gtk-dialog/gtk-logout-helper.c | 22 +++++++++++----------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/gtk-dialog/ck-pk-helper.c b/src/gtk-dialog/ck-pk-helper.c index dc7d900..6879517 100644 --- a/src/gtk-dialog/ck-pk-helper.c +++ b/src/gtk-dialog/ck-pk-helper.c @@ -26,7 +26,7 @@ with this program. If not, see . #include #include -#include "logout-dialog.h" +#include "dialog.h" #include "ck-pk-helper.h" static gboolean @@ -150,20 +150,20 @@ ck_multiple_users (void) } gboolean -pk_require_auth (LogoutDialogAction action) { - if (action == LOGOUT_DIALOG_LOGOUT) { +pk_require_auth (LogoutDialogType action) { + if (action == LOGOUT_DIALOG_TYPE_LOG_OUT) { return FALSE; } gchar * pk_action; if (ck_multiple_users()) { - if (action == LOGOUT_DIALOG_RESTART) { + if (action == LOGOUT_DIALOG_TYPE_RESTART) { pk_action = "org.freedesktop.consolekit.system.restart-multiple-users"; } else { pk_action = "org.freedesktop.consolekit.system.stop-multiple-users"; } } else { - if (action == LOGOUT_DIALOG_RESTART) { + if (action == LOGOUT_DIALOG_TYPE_RESTART) { pk_action = "org.freedesktop.consolekit.system.restart"; } else { pk_action = "org.freedesktop.consolekit.system.stop"; diff --git a/src/gtk-dialog/ck-pk-helper.h b/src/gtk-dialog/ck-pk-helper.h index 501a8c8..dfbb432 100644 --- a/src/gtk-dialog/ck-pk-helper.h +++ b/src/gtk-dialog/ck-pk-helper.h @@ -26,7 +26,7 @@ with this program. If not, see . #include -gboolean pk_require_auth (LogoutDialogAction action); +gboolean pk_require_auth (LogoutDialogType action); gboolean pk_can_do_action (const gchar *action_id, PolkitAuthorizationResult ** pol_result); #endif /* __CK_PK_HELPER__ */ diff --git a/src/gtk-dialog/dialog.h b/src/gtk-dialog/dialog.h index 79c8a05..bd6abd2 100644 --- a/src/gtk-dialog/dialog.h +++ b/src/gtk-dialog/dialog.h @@ -4,6 +4,8 @@ #include #include +#include + G_BEGIN_DECLS #define LOGOUT_DIALOG_TYPE (logout_dialog_get_type ()) diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index d8aea6b..09e6e86 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -25,12 +25,12 @@ with this program. If not, see . #include #include #include -#include "logout-dialog.h" +#include "dialog.h" #include "ck-pk-helper.h" #include "gconf-helper.h" static void -session_action (LogoutDialogAction action) +session_action (LogoutDialogType action) { DBusGConnection * sbus; DBusGProxy * sm_proxy; @@ -55,13 +55,13 @@ session_action (LogoutDialogAction action) g_clear_error (&error); - if (action == LOGOUT_DIALOG_LOGOUT) { + if (action == LOGOUT_DIALOG_TYPE_LOG_OUT) { res = dbus_g_proxy_call_with_timeout (sm_proxy, "Logout", INT_MAX, &error, G_TYPE_UINT, 1, G_TYPE_INVALID, G_TYPE_INVALID); - } else if (action == LOGOUT_DIALOG_SHUTDOWN) { + } else if (action == LOGOUT_DIALOG_TYPE_SHUTDOWN) { res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestShutdown", INT_MAX, &error, G_TYPE_INVALID, G_TYPE_INVALID); - } else if (action == LOGOUT_DIALOG_RESTART) { + } else if (action == LOGOUT_DIALOG_TYPE_RESTART) { res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestReboot", INT_MAX, &error, G_TYPE_INVALID, G_TYPE_INVALID); } else { @@ -85,26 +85,26 @@ session_action (LogoutDialogAction action) return; } -static LogoutDialogAction type = LOGOUT_DIALOG_LOGOUT; +static LogoutDialogType type = LOGOUT_DIALOG_TYPE_LOG_OUT; static gboolean option_logout (const gchar * arg, const gchar * value, gpointer data, GError * error) { - type = LOGOUT_DIALOG_LOGOUT; + type = LOGOUT_DIALOG_TYPE_LOG_OUT; return TRUE; } static gboolean option_shutdown (const gchar * arg, const gchar * value, gpointer data, GError * error) { - type = LOGOUT_DIALOG_SHUTDOWN; + type = LOGOUT_DIALOG_TYPE_SHUTDOWN; return TRUE; } static gboolean option_restart (const gchar * arg, const gchar * value, gpointer data, GError * error) { - type = LOGOUT_DIALOG_RESTART; + type = LOGOUT_DIALOG_TYPE_RESTART; return TRUE; } @@ -150,7 +150,7 @@ main (int argc, char * argv[]) not getting a dialog at all. */ /* if (!pk_require_auth(type) && !supress_confirmations()) { */ if (!supress_confirmations()) { - dialog = logout_dialog_new(type); + dialog = GTK_WIDGET(logout_dialog_new(type)); } if (dialog != NULL) { @@ -158,7 +158,7 @@ main (int argc, char * argv[]) gtk_widget_hide(dialog); if (response == GTK_RESPONSE_HELP) { - type = LOGOUT_DIALOG_RESTART; + type = LOGOUT_DIALOG_TYPE_RESTART; response = GTK_RESPONSE_OK; } -- cgit v1.2.3 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(-) 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 ab02e295a6e21e1acb577516f0796d0ff4cc7092 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 25 Feb 2010 11:54:38 -0600 Subject: 0.2.4 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 221da2c..b3bfd8b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.3) +AM_INIT_AUTOMAKE(indicator-session, 0.2.4) AM_MAINTAINER_MODE -- 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(-) 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(-) 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 7e8f0d662bd911cf8c9e79b24446449d31464b8b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 20:45:16 -0600 Subject: Unreffing the layout that we allocated --- src/indicator-session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/indicator-session.c b/src/indicator-session.c index a97eb95..a815e40 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -214,6 +214,7 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G gint width; pango_layout_get_pixel_size(layout, &width, NULL); + g_object_unref(layout); g_debug("Username width %dpx", width); gint point = pango_font_description_get_size(style->font_desc); -- cgit v1.2.3 From 1513ca78e4685f50051c37efcece4511347fc2f9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 21:29:52 -0600 Subject: Stealing the consolekit manager interface out of consolekit --- .bzrignore | 1 + src/Makefile.am | 8 + src/consolekit-manager.xml | 353 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 362 insertions(+) create mode 100644 src/consolekit-manager.xml diff --git a/.bzrignore b/.bzrignore index 0a49cb4..c993ea1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -54,3 +54,4 @@ indicator-session-[0-9].[0-9].[0-9].tar.gz indicator-session-[0-9].[0-9].tar.gz indicator-session-[0-9].[0-9].[0-9].tar.gz.asc indicator-session-[0-9].[0-9].tar.gz.asc +src/consolekit-manager-client.h diff --git a/src/Makefile.am b/src/Makefile.am index fdbf466..a07c782 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,6 +17,12 @@ libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libsession_la_LIBADD = $(APPLET_LIBS) libsession_la_LDFLAGS = -module -avoid-version +consolekit-manager-client.h: $(srcdir)/consolekit-manager.xml + dbus-binding-tool \ + --prefix=_consolekit_manager_client \ + --mode=glib-client \ + --output=consolekit-manager-client.h \ + $(srcdir)/consolekit-manager.xml users-service-client.h: $(srcdir)/users-service.xml dbus-binding-tool \ @@ -56,11 +62,13 @@ indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS) ############### BUILT_SOURCES = \ + consolekit-manager-client.h \ users-service-client.h \ users-service-marshal.h \ users-service-marshal.c EXTRA_DIST = \ + consolekit-manager.xml \ users-service.xml \ users-service.list diff --git a/src/consolekit-manager.xml b/src/consolekit-manager.xml new file mode 100644 index 0000000..f903b55 --- /dev/null +++ b/src/consolekit-manager.xml @@ -0,0 +1,353 @@ + + + + + + + + + This method initiates a request to restart (ie. reboot) the computer system. + + + + + + + + + + + + + + This method initiates a request to stop (ie. shutdown) the computer system. + + + + + + + + + + + + + + The secret cookie that is used to identify the new session + + + + + This method requests that a new Session + be created for the calling process. The properties of this new Session are set automatically + from information collected about the calling process. + + This new session exists until the calling process disconnects from the system bus or + calls CloseSession(). + + It is the responsibility of the calling process to set the environment variable + XDG_SESSION_COOKIE to the value of the returned cookie. This cookie should only + be made available to child processes of the caller so that they may be identified + as members of this session. + + See this simple example: + + DBusError error; + DBusMessage *message; + DBusMessage *reply; + + message = dbus_message_new_method_call ("org.freedesktop.ConsoleKit", + "/org/freedesktop/ConsoleKit/Manager", + "org.freedesktop.ConsoleKit.Manager", + "OpenSession"); + if (message == NULL) { + goto out; + } + + dbus_error_init (&error); + reply = dbus_connection_send_with_reply_and_block (connector->connection, + message, + -1, + &error); + if (reply == NULL) { + goto out; + } + + dbus_error_init (&error); + if (! dbus_message_get_args (reply, + &error, + DBUS_TYPE_STRING, &cookie, + DBUS_TYPE_INVALID)) { + goto out; + } + + + + OpenSessionWithParameters() + + + + + + + An array of sets of property names and values + + + + + The secret cookie that is used to identify the new session + + + + + This method requests that a new Session + be created for the calling process. The properties of this new Session are from the + parameters provided. + + This new session exists until the calling process disconnects from the system bus or + calls CloseSession(). + + It is the responsibility of the calling process to set the environment variable + XDG_SESSION_COOKIE to the value of the returned cookie. This cookie should only + be made available to child processes of the caller so that they may be identified + as members of this session. + + See the Session properties for a list of valid parameters. + + org.freedesktop.ConsoleKit.Session + This method is restricted to privileged users by D-Bus policy. + + + + + + + The secret cookie that is used to identify the session + + + + + Whether the session was successfully closed + + + + + This method is used to close the session identified by the supplied cookie. + + The session can only be closed by the same process that opened the session. + + + + + + + + + an array of Seat IDs + + + + + This gets a list of all the Seats + that are currently present on the system. + Each Seat ID is an D-Bus object path for the object that implements the + Seat interface. + + org.freedesktop.ConsoleKit.Seat + + + + + + + an array of Session IDs + + + + + This gets a list of all the Sessions + that are currently present on the system. + Each Session ID is an D-Bus object path for the object that implements the + Session interface. + + org.freedesktop.ConsoleKit.Session + + + + + + + + The secret cookie that is used to identify the session + + + + + The object identifier for the current session + + + + + Returns the session ID that is associated with the specified cookie. + + + + + + + + + The POSIX process ID + + + + + The object identifier for the current session + + + + + Attempts to determine the session ID for the specified + POSIX process ID (pid). + + + + + + + + + The object identifier for the current session + + + + + Attempts to determine the session ID that the caller belongs to. + + See this example of using dbus-send: + + dbus-send --system --dest=org.freedesktop.ConsoleKit \ + --type=method_call --print-reply --reply-timeout=2000 \ + /org/freedesktop/ConsoleKit/Manager \ + org.freedesktop.ConsoleKit.Manager.GetCurrentSession + + + + + + + + + POSIX User identification + + + + + an array of Session IDs + + + + + This gets a list of all the Sessions + that are currently open for the specified user. + Each Session ID is an D-Bus object path for the object that implements the + Session interface. + + + + + + + + User identification + + + + + an array of Session IDs + + + + + This gets a list of all the Sessions + that are currently open for the specified user. + Each Session ID is an D-Bus object path for the object that implements the + Session interface. + + + + + + + + + The value of the system-idle-hint + + + + + Returns TRUE if the idle-hint + property of every open session is TRUE or if there are no open sessions. + + + + + + + + An ISO 8601 format date-type string + + + + + Returns an ISO 8601 date-time string that corresponds to + the time of the last change of the system-idle-hint. + + + + + + + + + The Seat ID for the added seat + + + + + Emitted when a Seat has been added to the system. + + + + + + + + The Seat ID for the removed seat + + + + + Emitted when a Seat has been removed from the system. + + + + + + + + The value of the system-idle-hint + + + + + Emitted when the value of the system-idle-hint has changed. + + + + + + -- cgit v1.2.3 From bb12842de3558842bacbc9bafcff40490a8bc409 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 21:34:08 -0600 Subject: Switching to using the dbus client code. --- src/users-service-dbus.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index 0e5c922..2b984cd 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -34,6 +34,7 @@ #include "users-service-dbus.h" #include "users-service-client.h" #include "users-service-marshal.h" +#include "consolekit-manager-client.h" static void users_service_dbus_class_init (UsersServiceDbusClass *klass); static void users_service_dbus_init (UsersServiceDbus *self); @@ -509,14 +510,7 @@ add_sessions_for_user (UsersServiceDbus *self, int i; error = NULL; - if (!dbus_g_proxy_call (priv->ck_proxy, - "GetSessionsForUnixUser", - &error, - G_TYPE_UINT, user->uid, - G_TYPE_INVALID, - dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), - &sessions, - G_TYPE_INVALID)) + if (!org_freedesktop_ConsoleKit_Manager_get_sessions_for_unix_user(priv->ck_proxy, user->uid, &sessions, &error)) { g_debug ("Failed to call GetSessionsForUnixUser: %s", error->message); g_error_free (error); -- cgit v1.2.3 From 86a394ae84f4c09c0bfc7b7136bcc7e88ca04bc5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 11:33:51 -0600 Subject: Check the UID to see if it's me --- src/session-service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/session-service.c b/src/session-service.c index 289bff8..a2760d1 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -496,6 +496,11 @@ rebuild_items (DbusmenuMenuitem *root, user->service = service; + if (user->uid == getuid()) { + /* Hide me from the list */ + continue; + } + mi = dbusmenu_menuitem_new (); dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE); dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name); -- cgit v1.2.3 From 206f1003cad828ca2465088ea3fbf73b1a6a4c97 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 11:46:27 -0600 Subject: Making it so that users is not a global and just grabbed everytime and used. --- src/session-service.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index a2760d1..eeb88a9 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -69,7 +69,6 @@ static DbusmenuMenuitem *lock_menuitem = NULL; static DbusmenuMenuitem *switch_menuitem = NULL; static gint count; -static GList *users; static DbusmenuMenuitem * root_menuitem = NULL; static GMainLoop * mainloop = NULL; @@ -472,22 +471,11 @@ rebuild_items (DbusmenuMenuitem *root, } } + GList * users = NULL; + users = users_service_dbus_get_user_list (service); + if (count > MINIMUM_USERS && count < MAXIMUM_USERS) { - if (users != NULL) - { - GList *l = NULL; - - for (l = users; l != NULL; l = l->next) - { - users = g_list_delete_link (users, l); - } - - users = NULL; - } - - users = users_service_dbus_get_user_list (service); - users = g_list_sort (users, (GCompareFunc)compare_users_by_username); for (u = users; u != NULL; u = g_list_next (u)) @@ -509,6 +497,8 @@ rebuild_items (DbusmenuMenuitem *root, g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user); } } + + g_list_free(users); } DbusmenuMenuitem * separator = dbusmenu_menuitem_new(); -- cgit v1.2.3 From 40ef68c195d63a7d19e1ad237fc7ebed00c9c0c2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 11:48:18 -0600 Subject: Making it so that count is not a global and just calculated from the list. --- src/session-service.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index eeb88a9..30c14cf 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -68,8 +68,6 @@ static UsersServiceDbus *dbus_interface = NULL; static DbusmenuMenuitem *lock_menuitem = NULL; static DbusmenuMenuitem *switch_menuitem = NULL; -static gint count; - static DbusmenuMenuitem * root_menuitem = NULL; static GMainLoop * mainloop = NULL; static DBusGProxy * up_main_proxy = NULL; @@ -473,8 +471,9 @@ rebuild_items (DbusmenuMenuitem *root, GList * users = NULL; users = users_service_dbus_get_user_list (service); + guint user_count = g_list_length(users); - if (count > MINIMUM_USERS && count < MAXIMUM_USERS) + if (user_count > MINIMUM_USERS && user_count < MAXIMUM_USERS) { users = g_list_sort (users, (GCompareFunc)compare_users_by_username); @@ -563,8 +562,6 @@ user_added (UsersServiceDbus *service, { DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data; - count++; - rebuild_items (root, service); } @@ -577,8 +574,6 @@ user_removed (UsersServiceDbus *service, { DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data; - count--; - rebuild_items (root, service); } @@ -590,8 +585,6 @@ create_items (DbusmenuMenuitem *root, { g_return_if_fail (IS_USERS_SERVICE_DBUS (service)); - count = users_service_dbus_get_user_count (service); - rebuild_items (root, service); } -- cgit v1.2.3 From e5dd34b95bb29d4d1dc294c84bdbfe4c90f57b02 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 11:51:27 -0600 Subject: Restructuring callbacks to not need the count variable. --- src/session-service.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 30c14cf..42901a1 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -556,36 +556,13 @@ rebuild_items (DbusmenuMenuitem *root, /* Signal called when a user is added. It updates the count and rebuilds the menu */ static void -user_added (UsersServiceDbus *service, - UserData *user, - gpointer user_data) +user_change (UsersServiceDbus *service, + UserData *user, + gpointer user_data) { - DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data; - - rebuild_items (root, service); -} - -/* Signal called when a user is deleted. It updates the count and - rebuilds the menu */ -static void -user_removed (UsersServiceDbus *service, - UserData *user, - gpointer user_data) -{ - DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data; - - rebuild_items (root, service); -} - -/* Wrapper around rebuild_items that is used on the first call - so that we can initialize the count variable. */ -static void -create_items (DbusmenuMenuitem *root, - UsersServiceDbus *service) -{ - g_return_if_fail (IS_USERS_SERVICE_DBUS (service)); - - rebuild_items (root, service); + DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data; + rebuild_items (root, service); + return; } /* When the service interface starts to shutdown, we @@ -626,15 +603,15 @@ main (int argc, char ** argv) dbus_interface = g_object_new (USERS_SERVICE_DBUS_TYPE, NULL); - create_items (root_menuitem, dbus_interface); + rebuild_items (root_menuitem, dbus_interface); g_signal_connect (G_OBJECT (dbus_interface), "user-added", - G_CALLBACK (user_added), + G_CALLBACK (user_change), root_menuitem); g_signal_connect (G_OBJECT (dbus_interface), "user-removed", - G_CALLBACK (user_removed), + G_CALLBACK (user_change), root_menuitem); setup_up(); -- cgit v1.2.3 From e9d4b412bce99aee1cc4b3188c04635f95f60559 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 12:05:06 -0600 Subject: Switching things around a little bit. Making sure we always go through the list to search for the guest account to see if it's logged in. But, still not making menu entries. --- src/session-service.c | 74 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 42901a1..9e06bb0 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -412,6 +412,7 @@ rebuild_items (DbusmenuMenuitem *root, UsersServiceDbus *service) { DbusmenuMenuitem *mi = NULL; + DbusmenuMenuitem * guest_mi = NULL; GList *u; UserData *user; gboolean can_activate; @@ -441,12 +442,12 @@ rebuild_items (DbusmenuMenuitem *root, if (check_guest_session ()) { - mi = dbusmenu_menuitem_new (); - dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE); - dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, _("Guest Session")); - dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, FALSE); - dbusmenu_menuitem_child_append (root, mi); - g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL); + guest_mi = dbusmenu_menuitem_new (); + dbusmenu_menuitem_property_set (guest_mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE); + dbusmenu_menuitem_property_set (guest_mi, USER_ITEM_PROP_NAME, _("Guest Session")); + dbusmenu_menuitem_property_set_bool (guest_mi, USER_ITEM_PROP_LOGGED_IN, FALSE); + dbusmenu_menuitem_child_append (root, guest_mi); + g_signal_connect (G_OBJECT (guest_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL); } if (check_new_session ()) @@ -473,32 +474,45 @@ rebuild_items (DbusmenuMenuitem *root, users = users_service_dbus_get_user_list (service); guint user_count = g_list_length(users); - if (user_count > MINIMUM_USERS && user_count < MAXIMUM_USERS) - { - users = g_list_sort (users, (GCompareFunc)compare_users_by_username); - - for (u = users; u != NULL; u = g_list_next (u)) - { - user = u->data; - - user->service = service; - - if (user->uid == getuid()) { - /* Hide me from the list */ - continue; - } - - mi = dbusmenu_menuitem_new (); - dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE); - dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name); - dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL); - dbusmenu_menuitem_child_append (root, mi); - g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user); - } - } + if (user_count > MINIMUM_USERS && user_count < MAXIMUM_USERS) { + users = g_list_sort (users, (GCompareFunc)compare_users_by_username); + } + + for (u = users; u != NULL; u = g_list_next (u)) { + user = u->data; + user->service = service; + + if (user->uid == getuid()) { + /* Hide me from the list */ + continue; + } + + if (g_strcmp0(user->user_name, "guest") == 0) { + /* Check to see if the guest has sessions and so therefore should + get a check mark. */ + if (user->sessions != NULL) { + dbusmenu_menuitem_property_set_bool (guest_mi, USER_ITEM_PROP_LOGGED_IN, TRUE); + } + /* If we're showing user accounts, keep going through the list */ + if (user_count > MINIMUM_USERS && user_count < MAXIMUM_USERS) { + continue; + } + /* If not, we can stop here */ + break; + } + + if (user_count > MINIMUM_USERS && user_count < MAXIMUM_USERS) { + mi = dbusmenu_menuitem_new (); + dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE); + dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name); + dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL); + dbusmenu_menuitem_child_append (root, mi); + g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user); + } + } g_list_free(users); - } + } DbusmenuMenuitem * separator = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); -- cgit v1.2.3 From ad9dd9ec9a32d9380c12bce08d939d0f58d56555 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 16:08:23 -0600 Subject: Sort by real name --- src/session-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index 289bff8..5746f7d 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -406,7 +406,7 @@ compare_users_by_username (const gchar *a, UserData *user1 = (UserData *)a; UserData *user2 = (UserData *)b; - return g_strcmp0 (user1->user_name, user2->user_name); + return g_strcmp0 (user1->real_name, user2->real_name); } /* Builds up the menu for us */ -- cgit v1.2.3 From d723e8d4ed1e96c889d139a0f8c4cca117137c4a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 16:13:22 -0600 Subject: Creating a field for the user that has the real name in it, and a place for that to conflict. --- src/session-service.c | 10 +++++++++- src/users-service-dbus.c | 1 + src/users-service-dbus.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index 5746f7d..21c5b8b 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -406,7 +406,15 @@ compare_users_by_username (const gchar *a, UserData *user1 = (UserData *)a; UserData *user2 = (UserData *)b; - return g_strcmp0 (user1->real_name, user2->real_name); + gint retval = g_strcmp0 (user1->real_name, user2->real_name); + + /* If they're the same, they're both in conflict. */ + if (retval == 0) { + user1->real_name_conflict = TRUE; + user2->real_name_conflict = TRUE; + } + + return retval; } /* Builds up the menu for us */ diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index 0e5c922..7d2112a 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -662,6 +662,7 @@ sync_users (UsersServiceDbus *self) user->shell = g_strdup (g_value_get_string (g_value_array_get_nth (values, 3))); user->login_count = g_value_get_int (g_value_array_get_nth (values, 4)); user->icon_url = g_strdup (g_value_get_string (g_value_array_get_nth (values, 5))); + user->real_name_conflict = FALSE; g_hash_table_insert (priv->users, g_strdup (user->user_name), diff --git a/src/users-service-dbus.h b/src/users-service-dbus.h index 41052f8..bba88a7 100644 --- a/src/users-service-dbus.h +++ b/src/users-service-dbus.h @@ -47,6 +47,8 @@ struct _UserData GList *sessions; + gboolean real_name_conflict; + UsersServiceDbus *service; }; -- cgit v1.2.3 From 03c045f5890162a53ed613fcf8f627f0dc3badc8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 16:17:12 -0600 Subject: If we ARE a conflicted name then we need to fallback into displaying the user name. --- src/session-service.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/session-service.c b/src/session-service.c index 21c5b8b..85874b6 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -506,7 +506,13 @@ rebuild_items (DbusmenuMenuitem *root, mi = dbusmenu_menuitem_new (); dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE); + if (user->real_name_conflict) { + gchar * conflictedname = g_strdup_printf("%s (%s)", user->real_name, user->user_name); + dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, conflictedname); + g_free(conflictedname); + } else { dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name); + } dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL); dbusmenu_menuitem_child_append (root, mi); g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user); -- 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 ++++---- src/session-service.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) 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: diff --git a/src/session-service.c b/src/session-service.c index 9fb9ee7..a2b1234 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -542,9 +542,9 @@ rebuild_items (DbusmenuMenuitem *root, shutdown_mi = dbusmenu_menuitem_new(); if (supress_confirmations()) { - dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down")); + dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off")); } else { - dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down...")); + dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off...")); } dbusmenu_menuitem_child_append(root, shutdown_mi); g_signal_connect(G_OBJECT(shutdown_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown"); -- cgit v1.2.3 From 41b935109421b4087536d88fef2da54d4dece306 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 12:07:30 -0600 Subject: Suspends to sleep --- src/session-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index a2b1234..b7aa2b6 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -521,7 +521,7 @@ rebuild_items (DbusmenuMenuitem *root, suspend_mi = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set_bool(suspend_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); - dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Suspend")); + dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sleep")); dbusmenu_menuitem_child_append(root, suspend_mi); g_signal_connect(G_OBJECT(suspend_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Suspend"); -- cgit v1.2.3 From bdd9261ccfbd3bf0e59a6cb495663c425a0dcbe3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 13:39:51 -0600 Subject: Adding in all the strings. --- src/gtk-dialog/dialog.c | 34 ++++++++++++++++++++++++++++++++++ src/gtk-dialog/dialog.h | 3 ++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/gtk-dialog/dialog.c b/src/gtk-dialog/dialog.c index 06b146c..186a506 100644 --- a/src/gtk-dialog/dialog.c +++ b/src/gtk-dialog/dialog.c @@ -2,8 +2,42 @@ #include "config.h" #endif +#include + #include "dialog.h" +/* Strings */ + +static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"), + /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"), + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off") +}; + +static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ N_("Are you sure you want to close all programs and log out?"), + /* LOGOUT_DIALOG_RESTART, */ N_("Are you sure you want to close all programs and restart the computer?"), + /* LOGOUT_DIALOG_SHUTDOWN, */ N_("Are you sure you want to close all programs and shut down the computer?") +}; + +static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"), + /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"), + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off") +}; + +static const gchar * restart_updates = N_("Restart Instead"); +static const gchar * restart_auth = N_("Restart..."); +static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts."); + +static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ "system-log-out", + /* LOGOUT_DIALOG_RESTART, */ "system-restart", + /* LOGOUT_DIALOG_SHUTDOWN, */ "system-shutdown" +}; + + + typedef struct _LogoutDialogPrivate LogoutDialogPrivate; struct _LogoutDialogPrivate { guint type; diff --git a/src/gtk-dialog/dialog.h b/src/gtk-dialog/dialog.h index bd6abd2..1e6f575 100644 --- a/src/gtk-dialog/dialog.h +++ b/src/gtk-dialog/dialog.h @@ -19,7 +19,8 @@ typedef enum _LogoutDialogType LogoutDialogType; enum _LogoutDialogType { LOGOUT_DIALOG_TYPE_LOG_OUT, LOGOUT_DIALOG_TYPE_RESTART, - LOGOUT_DIALOG_TYPE_SHUTDOWN + LOGOUT_DIALOG_TYPE_SHUTDOWN, + LOGOUT_DIALOG_TYPE_CNT }; typedef struct _LogoutDialog LogoutDialog; -- cgit v1.2.3 From 087e8950fc86d9a6e2454d54df505ff167f5dc71 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 13:41:16 -0600 Subject: Switching translatable file. --- po/POTFILES.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4f28e2a..913dc25 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,6 +3,6 @@ data/indicator-session.schemas.in src/gtk-dialog/ck-pk-helper.c src/gtk-dialog/gconf-helper.c src/gtk-dialog/gtk-logout-helper.c -src/gtk-dialog/logout-dialog.c +src/gtk-dialog/dialog.c src/indicator-session.c src/session-service.c -- cgit v1.2.3 From 25a24b5af992231732e58763786d7fc82914da8e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 14:13:11 -0600 Subject: Provide the basis for the window --- src/gtk-dialog/dialog.c | 27 ++++++++++++++++++++++++--- src/gtk-dialog/dialog.h | 4 ++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/gtk-dialog/dialog.c b/src/gtk-dialog/dialog.c index 186a506..9dcc194 100644 --- a/src/gtk-dialog/dialog.c +++ b/src/gtk-dialog/dialog.c @@ -26,9 +26,11 @@ static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off") }; +/* static const gchar * restart_updates = N_("Restart Instead"); static const gchar * restart_auth = N_("Restart..."); static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts."); +*/ static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ "system-log-out", @@ -51,7 +53,7 @@ static void logout_dialog_init (LogoutDialog *self); static void logout_dialog_dispose (GObject *object); static void logout_dialog_finalize (GObject *object); -G_DEFINE_TYPE (LogoutDialog, logout_dialog, GTK_TYPE_DIALOG); +G_DEFINE_TYPE (LogoutDialog, logout_dialog, GTK_TYPE_MESSAGE_DIALOG); static void logout_dialog_class_init (LogoutDialogClass *klass) @@ -94,6 +96,25 @@ logout_dialog_finalize (GObject *object) LogoutDialog * logout_dialog_new (LogoutDialogType type) { - - return NULL; + LogoutDialog * dialog = LOGOUT_DIALOG(g_object_new(LOGOUT_DIALOG_TYPE, + /* Window */ + "icon-name", icon_strings[type], + "modal", TRUE, + "resizable", FALSE, + "title", _(title_strings[type]), + "window-position", GTK_WIN_POS_CENTER_ALWAYS, + /* Dialog */ + "has-separator", FALSE, + /* Message Dialog */ + "message-type", GTK_MESSAGE_OTHER, + "buttons", GTK_BUTTONS_NONE, + "text", _(body_strings[type]), + NULL)); + + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + _(button_strings[type]), GTK_RESPONSE_OK, + _("Cancel"), GTK_RESPONSE_CANCEL, + NULL); + + return dialog; } diff --git a/src/gtk-dialog/dialog.h b/src/gtk-dialog/dialog.h index 1e6f575..3240a8e 100644 --- a/src/gtk-dialog/dialog.h +++ b/src/gtk-dialog/dialog.h @@ -27,11 +27,11 @@ typedef struct _LogoutDialog LogoutDialog; typedef struct _LogoutDialogClass LogoutDialogClass; struct _LogoutDialogClass { - GtkDialogClass parent_class; + GtkMessageDialogClass parent_class; }; struct _LogoutDialog { - GtkDialog parent; + GtkMessageDialog parent; }; GType logout_dialog_get_type (void); -- cgit v1.2.3 From 84c4324d547a81969e0de563732eb923c83e7ea6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 14:16:56 -0600 Subject: Putting the image in and cleaning up the props --- src/gtk-dialog/dialog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gtk-dialog/dialog.c b/src/gtk-dialog/dialog.c index 9dcc194..96ebf21 100644 --- a/src/gtk-dialog/dialog.c +++ b/src/gtk-dialog/dialog.c @@ -96,6 +96,9 @@ logout_dialog_finalize (GObject *object) LogoutDialog * logout_dialog_new (LogoutDialogType type) { + GtkWidget * image = gtk_image_new_from_icon_name(icon_strings[type], GTK_ICON_SIZE_DIALOG); + gtk_widget_show(image); + LogoutDialog * dialog = LOGOUT_DIALOG(g_object_new(LOGOUT_DIALOG_TYPE, /* Window */ "icon-name", icon_strings[type], @@ -103,11 +106,10 @@ logout_dialog_new (LogoutDialogType type) "resizable", FALSE, "title", _(title_strings[type]), "window-position", GTK_WIN_POS_CENTER_ALWAYS, - /* Dialog */ - "has-separator", FALSE, /* Message Dialog */ - "message-type", GTK_MESSAGE_OTHER, "buttons", GTK_BUTTONS_NONE, + "image", image, + "message-type", GTK_MESSAGE_OTHER, "text", _(body_strings[type]), NULL)); -- cgit v1.2.3 From 3f35021350143255280fe30b1f38c46219c72f6b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 14:51:57 -0600 Subject: Flipping button order --- src/gtk-dialog/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gtk-dialog/dialog.c b/src/gtk-dialog/dialog.c index 96ebf21..18f345f 100644 --- a/src/gtk-dialog/dialog.c +++ b/src/gtk-dialog/dialog.c @@ -114,8 +114,8 @@ logout_dialog_new (LogoutDialogType type) NULL)); gtk_dialog_add_buttons(GTK_DIALOG(dialog), - _(button_strings[type]), GTK_RESPONSE_OK, _("Cancel"), GTK_RESPONSE_CANCEL, + _(button_strings[type]), GTK_RESPONSE_OK, NULL); return dialog; -- cgit v1.2.3 From f998b8b0d4bb9d9965f804ad5004b089a61f0248 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 14:52:09 -0600 Subject: Removing the old ck-pk helpers. --- src/gtk-dialog/Makefile.am | 2 - src/gtk-dialog/ck-pk-helper.c | 222 ------------------------------------- src/gtk-dialog/ck-pk-helper.h | 32 ------ src/gtk-dialog/gtk-logout-helper.c | 6 - 4 files changed, 262 deletions(-) delete mode 100644 src/gtk-dialog/ck-pk-helper.c delete mode 100644 src/gtk-dialog/ck-pk-helper.h diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am index 2c7e61a..508beb2 100644 --- a/src/gtk-dialog/Makefile.am +++ b/src/gtk-dialog/Makefile.am @@ -3,8 +3,6 @@ libexec_PROGRAMS = gtk-logout-helper gtk_logout_helper_SOURCES = \ gtk-logout-helper.c \ - ck-pk-helper.c \ - ck-pk-helper.h \ gconf-helper.c \ gconf-helper.h \ dialog.c \ diff --git a/src/gtk-dialog/ck-pk-helper.c b/src/gtk-dialog/ck-pk-helper.c deleted file mode 100644 index 6879517..0000000 --- a/src/gtk-dialog/ck-pk-helper.c +++ /dev/null @@ -1,222 +0,0 @@ -/* -A small wrapper utility to load indicators and put them as menu items -into the gnome-panel using it's applet interface. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - - -#include -#include -#include -#include - -#include "dialog.h" -#include "ck-pk-helper.h" - -static gboolean -ck_multiple_users (void) -{ - DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL); - g_return_val_if_fail(sbus != NULL, TRUE); /* worst case */ - DBusGProxy * proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit", - "/org/freedesktop/ConsoleKit/Manager", - "org.freedesktop.ConsoleKit.Manager"); - - if (proxy == NULL) { - return TRUE; - } - - gboolean result; - GPtrArray * seats = NULL; - - result = dbus_g_proxy_call(proxy, "GetSeats", NULL, G_TYPE_INVALID, - dbus_g_type_get_collection("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &seats, G_TYPE_INVALID); - - if (!result) { - g_warning("Unable to get the seats for ConsoleKit"); - g_object_unref(proxy); - return TRUE; - } - - gchar * this_session_id = NULL; - - result = dbus_g_proxy_call(proxy, "GetCurrentSession", NULL, G_TYPE_INVALID, - DBUS_TYPE_G_OBJECT_PATH, &this_session_id, G_TYPE_INVALID); - - g_object_unref(proxy); - - if (!result) { - g_warning("Unable to get current session from ConsoleKit"); - return TRUE; - } - - proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit", - this_session_id, "org.freedesktop.ConsoleKit.Session"); - - if (proxy == NULL) { - return TRUE; - } - - guint this_session_uid; - - result = dbus_g_proxy_call(proxy, "GetUnixUser", NULL, G_TYPE_INVALID, - G_TYPE_UINT, &this_session_uid, G_TYPE_INVALID); - - if (!result) { - g_warning("Unable to get UID from ConsoleKit"); - return TRUE; - } - - guint seat; - gboolean multiple_users = FALSE; - for (seat = 0; seat < seats->len; seat++) { - gchar * seat_id = g_ptr_array_index(seats, seat); - DBusGProxy * seat_proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit", - seat_id, "org.freedesktop.ConsoleKit.Seat"); - g_free(seat_id); - - if (seat_proxy == NULL) { - continue; - } - - GPtrArray * sessions = NULL; - - gboolean result = dbus_g_proxy_call(seat_proxy, - "GetSessions", NULL, G_TYPE_INVALID, - dbus_g_type_get_collection("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &sessions, G_TYPE_INVALID); - - g_object_unref(seat_proxy); - if (!result) { - continue; - } - - guint session; - for (session = 0; session < sessions->len; session++) { - gchar * session_id = g_ptr_array_index(sessions, session); - if (g_strcmp0(this_session_id, session_id) == 0) { - continue; - } - DBusGProxy * session_proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit", - session_id, "org.freedesktop.ConsoleKit.Session"); - g_free(session_id); - - if (session_proxy == NULL) { - continue; - } - - guint session_uid; - result = dbus_g_proxy_call(session_proxy, "GetUnixUser", NULL, G_TYPE_INVALID, - G_TYPE_UINT, &session_uid, G_TYPE_INVALID); - g_object_unref(session_proxy); - - if (!result) { - continue; - } - - if (session_uid != this_session_uid) { - multiple_users = TRUE; - break; - } - } - - g_ptr_array_free(sessions, TRUE); - - if (multiple_users) { - break; - } - } - - g_ptr_array_free(seats, TRUE); - g_object_unref(proxy); - g_free(this_session_id); - - return multiple_users; -} - -gboolean -pk_require_auth (LogoutDialogType action) { - if (action == LOGOUT_DIALOG_TYPE_LOG_OUT) { - return FALSE; - } - - gchar * pk_action; - if (ck_multiple_users()) { - if (action == LOGOUT_DIALOG_TYPE_RESTART) { - pk_action = "org.freedesktop.consolekit.system.restart-multiple-users"; - } else { - pk_action = "org.freedesktop.consolekit.system.stop-multiple-users"; - } - } else { - if (action == LOGOUT_DIALOG_TYPE_RESTART) { - pk_action = "org.freedesktop.consolekit.system.restart"; - } else { - pk_action = "org.freedesktop.consolekit.system.stop"; - } - } - - PolkitAuthorizationResult *polres = NULL; - gboolean ret = FALSE; - if (pk_can_do_action(pk_action, &polres)) { - if (polkit_authorization_result_get_is_challenge (polres)) { - ret = TRUE; - } - g_debug ("pk_require_auth(%s): authorized, is_challenge: %i", pk_action, ret); - } else { - g_debug ("pk_require_auth(%s): not authorized", pk_action); - } - if (polres) { - g_object_unref (polres); - } - return ret; -} - -gboolean -pk_can_do_action (const gchar *action_id, PolkitAuthorizationResult ** pol_result) -{ - PolkitAuthority *authority; - PolkitSubject *subject; - PolkitAuthorizationResult *result; - gboolean ret; - - authority = polkit_authority_get(); - if (!authority) { - g_warning ("Could not get PolicyKit authority instance"); - return FALSE; - } - subject = polkit_unix_process_new (getpid()); - - result = polkit_authority_check_authorization_sync (authority, subject, action_id, NULL, 0, NULL, NULL); - g_object_unref (authority); - - ret = FALSE; - if (result) { - ret = polkit_authorization_result_get_is_authorized (result) || - polkit_authorization_result_get_is_challenge (result); - g_debug ("pk_can_do_action(%s): %i", action_id, ret); - } else { - g_warning ("pk_can_do_action(%s): check_authorization returned NULL", action_id); - } - if (pol_result) { - *pol_result = result; - } else { - g_object_unref (result); - } - return ret; - -} diff --git a/src/gtk-dialog/ck-pk-helper.h b/src/gtk-dialog/ck-pk-helper.h deleted file mode 100644 index dfbb432..0000000 --- a/src/gtk-dialog/ck-pk-helper.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -A small wrapper utility to load indicators and put them as menu items -into the gnome-panel using it's applet interface. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - - -#ifndef __CK_PK_HELPER_H__ -#define __CK_PK_HELPER_H__ 1 - -#include - -gboolean pk_require_auth (LogoutDialogType action); -gboolean pk_can_do_action (const gchar *action_id, PolkitAuthorizationResult ** pol_result); - -#endif /* __CK_PK_HELPER__ */ diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index 09e6e86..5f087ff 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -26,7 +26,6 @@ with this program. If not, see . #include #include #include "dialog.h" -#include "ck-pk-helper.h" #include "gconf-helper.h" static void @@ -144,11 +143,6 @@ main (int argc, char * argv[]) INDICATOR_ICONS_DIR); GtkWidget * dialog = NULL; - /* TODO: We're disabling PolicyKit checking here because there - is a bug in ConsoleKit where the dialog doesn't come up until - the session is entirely closed. Stupid, but it's better than - not getting a dialog at all. */ - /* if (!pk_require_auth(type) && !supress_confirmations()) { */ if (!supress_confirmations()) { dialog = GTK_WIDGET(logout_dialog_new(type)); } -- cgit v1.2.3 From b51d58db757ccec277216f3e4f3e74c67ea75884 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 15:27:51 -0600 Subject: Skeleton for checking the different states. --- src/gtk-dialog/dialog.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/gtk-dialog/dialog.c b/src/gtk-dialog/dialog.c index 18f345f..7e2347e 100644 --- a/src/gtk-dialog/dialog.c +++ b/src/gtk-dialog/dialog.c @@ -93,6 +93,25 @@ logout_dialog_finalize (GObject *object) return; } +/* Checks for updates that would signal that a restart is + required for them to apply */ +static gboolean +check_restart_required (void) +{ + + return FALSE; +} + +/* Checks with console kit to see if we can do what we want */ +static gboolean +ck_check_allowed (LogoutDialogType type) +{ + + + + return TRUE; +} + LogoutDialog * logout_dialog_new (LogoutDialogType type) { @@ -113,6 +132,18 @@ logout_dialog_new (LogoutDialogType type) "text", _(body_strings[type]), NULL)); + gboolean allowed = FALSE; + if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) { + allowed = ck_check_allowed(LOGOUT_DIALOG_TYPE_RESTART); + } else { + allowed = ck_check_allowed(type); + } + + gboolean restart_required = FALSE; + if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) { + restart_required = check_restart_required(); + } + gtk_dialog_add_buttons(GTK_DIALOG(dialog), _("Cancel"), GTK_RESPONSE_CANCEL, _(button_strings[type]), GTK_RESPONSE_OK, -- cgit v1.2.3 From d9dd91ad86cfff9457140ee4debd68752e79a99c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 15:42:31 -0600 Subject: Updating merge to new enums. --- src/gtk-dialog/gtk-logout-helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index a76a135..bf37ca7 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -29,7 +29,7 @@ with this program. If not, see . #include "gconf-helper.h" static void -consolekit_fallback (LogoutDialogAction action) +consolekit_fallback (LogoutDialogType action) { DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL); g_return_if_fail(sbus != NULL); /* worst case */ @@ -45,16 +45,16 @@ consolekit_fallback (LogoutDialogAction action) GError * error = NULL; switch (action) { - case LOGOUT_DIALOG_LOGOUT: + case LOGOUT_DIALOG_TYPE_LOG_OUT: 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: + case LOGOUT_DIALOG_TYPE_SHUTDOWN: dbus_g_proxy_call(proxy, "Stop", &error, G_TYPE_INVALID); break; - case LOGOUT_DIALOG_RESTART: + case LOGOUT_DIALOG_TYPE_RESTART: dbus_g_proxy_call(proxy, "Restart", &error, -- cgit v1.2.3 From 68d13604c069937cdb1e6cab3ecd54cfb45fc593 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 15:49:41 -0600 Subject: Flattening the build tree. --- configure.ac | 1 - po/POTFILES.in | 7 +- src/Makefile.am | 31 +++++- src/dialog.c | 153 ++++++++++++++++++++++++++ src/dialog.h | 42 ++++++++ src/gconf-helper.c | 73 +++++++++++++ src/gconf-helper.h | 50 +++++++++ src/gtk-dialog/Makefile.am | 13 --- src/gtk-dialog/dialog.c | 153 -------------------------- src/gtk-dialog/dialog.h | 42 -------- src/gtk-dialog/gconf-helper.c | 73 ------------- src/gtk-dialog/gconf-helper.h | 50 --------- src/gtk-dialog/gtk-logout-helper.c | 216 ------------------------------------- src/gtk-logout-helper.c | 216 +++++++++++++++++++++++++++++++++++++ src/session-service.c | 2 +- 15 files changed, 566 insertions(+), 556 deletions(-) create mode 100644 src/dialog.c create mode 100644 src/dialog.h create mode 100644 src/gconf-helper.c create mode 100644 src/gconf-helper.h delete mode 100644 src/gtk-dialog/Makefile.am delete mode 100644 src/gtk-dialog/dialog.c delete mode 100644 src/gtk-dialog/dialog.h delete mode 100644 src/gtk-dialog/gconf-helper.c delete mode 100644 src/gtk-dialog/gconf-helper.h delete mode 100644 src/gtk-dialog/gtk-logout-helper.c create mode 100644 src/gtk-logout-helper.c diff --git a/configure.ac b/configure.ac index b3bfd8b..0faca94 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,6 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile src/Makefile -src/gtk-dialog/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 913dc25..6492f1e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,8 +1,7 @@ [encoding: UTF-8] data/indicator-session.schemas.in -src/gtk-dialog/ck-pk-helper.c -src/gtk-dialog/gconf-helper.c -src/gtk-dialog/gtk-logout-helper.c -src/gtk-dialog/dialog.c +src/gconf-helper.c +src/gtk-logout-helper.c +src/dialog.c src/indicator-session.c src/session-service.c diff --git a/src/Makefile.am b/src/Makefile.am index a07c782..cd525bd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ -SUBDIRS = gtk-dialog -libexec_PROGRAMS = indicator-session-service +libexec_PROGRAMS = \ + indicator-session-service \ + gtk-logout-helper ################### # Indicator Stuff @@ -50,13 +51,37 @@ indicator_session_service_SOURCES = \ lock-helper.h \ session-service.c \ dbusmenu-shared.h \ - gtk-dialog/gconf-helper.c \ + gconf-helper.c \ users-service-dbus.h \ users-service-dbus.c \ users-service-marshal.c indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS) +################# +# GTK Logout Stuff +################# + +gtk_logout_helper_SOURCES = \ + gtk-logout-helper.c \ + gconf-helper.c \ + gconf-helper.h \ + dialog.c \ + dialog.h + +gtk_logout_helper_CFLAGS = \ + $(SESSIONSERVICE_CFLAGS) \ + $(GTKLOGOUTHELPER_CFLAGS) \ + $(GCONF_CFLAGS) \ + -Wall -Werror \ + -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" + +gtk_logout_helper_LDADD = \ + $(SESSIONSERVICE_LIBS) \ + $(GTKLOGOUTHELPER_LIBS) \ + $(GCONF_LIBS) + + ############### # Other Stuff ############### diff --git a/src/dialog.c b/src/dialog.c new file mode 100644 index 0000000..7e2347e --- /dev/null +++ b/src/dialog.c @@ -0,0 +1,153 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include + +#include "dialog.h" + +/* Strings */ + +static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"), + /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"), + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off") +}; + +static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ N_("Are you sure you want to close all programs and log out?"), + /* LOGOUT_DIALOG_RESTART, */ N_("Are you sure you want to close all programs and restart the computer?"), + /* LOGOUT_DIALOG_SHUTDOWN, */ N_("Are you sure you want to close all programs and shut down the computer?") +}; + +static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"), + /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"), + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off") +}; + +/* +static const gchar * restart_updates = N_("Restart Instead"); +static const gchar * restart_auth = N_("Restart..."); +static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts."); +*/ + +static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ "system-log-out", + /* LOGOUT_DIALOG_RESTART, */ "system-restart", + /* LOGOUT_DIALOG_SHUTDOWN, */ "system-shutdown" +}; + + + +typedef struct _LogoutDialogPrivate LogoutDialogPrivate; +struct _LogoutDialogPrivate { + guint type; +}; + +#define LOGOUT_DIALOG_GET_PRIVATE(o) \ +(G_TYPE_INSTANCE_GET_PRIVATE ((o), LOGOUT_DIALOG_TYPE, LogoutDialogPrivate)) + +static void logout_dialog_class_init (LogoutDialogClass *klass); +static void logout_dialog_init (LogoutDialog *self); +static void logout_dialog_dispose (GObject *object); +static void logout_dialog_finalize (GObject *object); + +G_DEFINE_TYPE (LogoutDialog, logout_dialog, GTK_TYPE_MESSAGE_DIALOG); + +static void +logout_dialog_class_init (LogoutDialogClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (LogoutDialogPrivate)); + + object_class->dispose = logout_dialog_dispose; + object_class->finalize = logout_dialog_finalize; + + return; +} + +static void +logout_dialog_init (LogoutDialog *self) +{ + + return; +} + +static void +logout_dialog_dispose (GObject *object) +{ + + + G_OBJECT_CLASS (logout_dialog_parent_class)->dispose (object); + return; +} + +static void +logout_dialog_finalize (GObject *object) +{ + + + G_OBJECT_CLASS (logout_dialog_parent_class)->finalize (object); + return; +} + +/* Checks for updates that would signal that a restart is + required for them to apply */ +static gboolean +check_restart_required (void) +{ + + return FALSE; +} + +/* Checks with console kit to see if we can do what we want */ +static gboolean +ck_check_allowed (LogoutDialogType type) +{ + + + + return TRUE; +} + +LogoutDialog * +logout_dialog_new (LogoutDialogType type) +{ + GtkWidget * image = gtk_image_new_from_icon_name(icon_strings[type], GTK_ICON_SIZE_DIALOG); + gtk_widget_show(image); + + LogoutDialog * dialog = LOGOUT_DIALOG(g_object_new(LOGOUT_DIALOG_TYPE, + /* Window */ + "icon-name", icon_strings[type], + "modal", TRUE, + "resizable", FALSE, + "title", _(title_strings[type]), + "window-position", GTK_WIN_POS_CENTER_ALWAYS, + /* Message Dialog */ + "buttons", GTK_BUTTONS_NONE, + "image", image, + "message-type", GTK_MESSAGE_OTHER, + "text", _(body_strings[type]), + NULL)); + + gboolean allowed = FALSE; + if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) { + allowed = ck_check_allowed(LOGOUT_DIALOG_TYPE_RESTART); + } else { + allowed = ck_check_allowed(type); + } + + gboolean restart_required = FALSE; + if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) { + restart_required = check_restart_required(); + } + + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + _("Cancel"), GTK_RESPONSE_CANCEL, + _(button_strings[type]), GTK_RESPONSE_OK, + NULL); + + return dialog; +} diff --git a/src/dialog.h b/src/dialog.h new file mode 100644 index 0000000..3240a8e --- /dev/null +++ b/src/dialog.h @@ -0,0 +1,42 @@ +#ifndef __LOGOUT_DIALOG_H__ +#define __LOGOUT_DIALOG_H__ + +#include +#include + +#include + +G_BEGIN_DECLS + +#define LOGOUT_DIALOG_TYPE (logout_dialog_get_type ()) +#define LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOGOUT_DIALOG_TYPE, LogoutDialog)) +#define LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LOGOUT_DIALOG_TYPE, LogoutDialogClass)) +#define IS_LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LOGOUT_DIALOG_TYPE)) +#define IS_LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_DIALOG_TYPE)) +#define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_DIALOG_TYPE, LogoutDialogClass)) + +typedef enum _LogoutDialogType LogoutDialogType; +enum _LogoutDialogType { + LOGOUT_DIALOG_TYPE_LOG_OUT, + LOGOUT_DIALOG_TYPE_RESTART, + LOGOUT_DIALOG_TYPE_SHUTDOWN, + LOGOUT_DIALOG_TYPE_CNT +}; + +typedef struct _LogoutDialog LogoutDialog; +typedef struct _LogoutDialogClass LogoutDialogClass; + +struct _LogoutDialogClass { + GtkMessageDialogClass parent_class; +}; + +struct _LogoutDialog { + GtkMessageDialog parent; +}; + +GType logout_dialog_get_type (void); +LogoutDialog * logout_dialog_new (LogoutDialogType type); + +G_END_DECLS + +#endif diff --git a/src/gconf-helper.c b/src/gconf-helper.c new file mode 100644 index 0000000..213592e --- /dev/null +++ b/src/gconf-helper.c @@ -0,0 +1,73 @@ +/* +A small wrapper utility for connecting to gconf. + +Copyright 2009 Canonical Ltd. + +Authors: + Christoph Korn + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + + +#include + +#include + +#include +#include + +#include +#include + +#include "gconf-helper.h" + +static GConfClient * gconf_client = NULL; + +gboolean +supress_confirmations (void) { + if(!gconf_client) { + gconf_client = gconf_client_get_default (); + } + return gconf_client_get_bool (gconf_client, SUPPRESS_KEY, NULL) ; +} + +static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer data) { + RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = (RestartShutdownLogoutMenuItems*) data; + GConfValue * value = gconf_entry_get_value (entry); + const gchar * key = gconf_entry_get_key (entry); + + if(g_strcmp0 (key, SUPPRESS_KEY) == 0) { + 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")); + } 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...")); + } + } +} + +void +update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) { + if(!gconf_client) { + gconf_client = gconf_client_get_default (); + } + gconf_client_add_dir (gconf_client, GLOBAL_DIR, + GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + gconf_client_notify_add (gconf_client, SUPPRESS_KEY, + update_menu_entries_callback, restart_shutdown_logout_mi, NULL, NULL); +} + diff --git a/src/gconf-helper.h b/src/gconf-helper.h new file mode 100644 index 0000000..951bb0f --- /dev/null +++ b/src/gconf-helper.h @@ -0,0 +1,50 @@ +/* +A small wrapper utility for connecting to gconf. + +Copyright 2009 Canonical Ltd. + +Authors: + Christoph Korn + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + + +#ifndef __GCONF_HELPER_H__ +#define __GCONF_HELPER_H__ 1 + +#include + +#include + +#include +#include + +#include +#include + +#define SUPPRESS_KEY "/apps/indicator-session/suppress_logout_restart_shutdown" +#define GLOBAL_DIR "/apps/indicator-session" + +typedef struct _RestartShutdownLogoutMenuItems +{ + DbusmenuMenuitem * logout_mi; + DbusmenuMenuitem * restart_mi; + DbusmenuMenuitem * shutdown_mi; +} +RestartShutdownLogoutMenuItems; + +void update_menu_entries(RestartShutdownLogoutMenuItems*); +gboolean supress_confirmations (void); + +#endif /* __GCONF_HELPER__ */ diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am deleted file mode 100644 index 508beb2..0000000 --- a/src/gtk-dialog/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ - -libexec_PROGRAMS = gtk-logout-helper - -gtk_logout_helper_SOURCES = \ - gtk-logout-helper.c \ - gconf-helper.c \ - gconf-helper.h \ - dialog.c \ - dialog.h - -gtk_logout_helper_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" -gtk_logout_helper_LDADD = $(SESSIONSERVICE_LIBS) $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS) - diff --git a/src/gtk-dialog/dialog.c b/src/gtk-dialog/dialog.c deleted file mode 100644 index 7e2347e..0000000 --- a/src/gtk-dialog/dialog.c +++ /dev/null @@ -1,153 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include "dialog.h" - -/* Strings */ - -static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = { - /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"), - /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off") -}; - -static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = { - /* LOGOUT_DIALOG_LOGOUT, */ N_("Are you sure you want to close all programs and log out?"), - /* LOGOUT_DIALOG_RESTART, */ N_("Are you sure you want to close all programs and restart the computer?"), - /* LOGOUT_DIALOG_SHUTDOWN, */ N_("Are you sure you want to close all programs and shut down the computer?") -}; - -static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { - /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"), - /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off") -}; - -/* -static const gchar * restart_updates = N_("Restart Instead"); -static const gchar * restart_auth = N_("Restart..."); -static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts."); -*/ - -static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = { - /* LOGOUT_DIALOG_LOGOUT, */ "system-log-out", - /* LOGOUT_DIALOG_RESTART, */ "system-restart", - /* LOGOUT_DIALOG_SHUTDOWN, */ "system-shutdown" -}; - - - -typedef struct _LogoutDialogPrivate LogoutDialogPrivate; -struct _LogoutDialogPrivate { - guint type; -}; - -#define LOGOUT_DIALOG_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), LOGOUT_DIALOG_TYPE, LogoutDialogPrivate)) - -static void logout_dialog_class_init (LogoutDialogClass *klass); -static void logout_dialog_init (LogoutDialog *self); -static void logout_dialog_dispose (GObject *object); -static void logout_dialog_finalize (GObject *object); - -G_DEFINE_TYPE (LogoutDialog, logout_dialog, GTK_TYPE_MESSAGE_DIALOG); - -static void -logout_dialog_class_init (LogoutDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (LogoutDialogPrivate)); - - object_class->dispose = logout_dialog_dispose; - object_class->finalize = logout_dialog_finalize; - - return; -} - -static void -logout_dialog_init (LogoutDialog *self) -{ - - return; -} - -static void -logout_dialog_dispose (GObject *object) -{ - - - G_OBJECT_CLASS (logout_dialog_parent_class)->dispose (object); - return; -} - -static void -logout_dialog_finalize (GObject *object) -{ - - - G_OBJECT_CLASS (logout_dialog_parent_class)->finalize (object); - return; -} - -/* Checks for updates that would signal that a restart is - required for them to apply */ -static gboolean -check_restart_required (void) -{ - - return FALSE; -} - -/* Checks with console kit to see if we can do what we want */ -static gboolean -ck_check_allowed (LogoutDialogType type) -{ - - - - return TRUE; -} - -LogoutDialog * -logout_dialog_new (LogoutDialogType type) -{ - GtkWidget * image = gtk_image_new_from_icon_name(icon_strings[type], GTK_ICON_SIZE_DIALOG); - gtk_widget_show(image); - - LogoutDialog * dialog = LOGOUT_DIALOG(g_object_new(LOGOUT_DIALOG_TYPE, - /* Window */ - "icon-name", icon_strings[type], - "modal", TRUE, - "resizable", FALSE, - "title", _(title_strings[type]), - "window-position", GTK_WIN_POS_CENTER_ALWAYS, - /* Message Dialog */ - "buttons", GTK_BUTTONS_NONE, - "image", image, - "message-type", GTK_MESSAGE_OTHER, - "text", _(body_strings[type]), - NULL)); - - gboolean allowed = FALSE; - if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) { - allowed = ck_check_allowed(LOGOUT_DIALOG_TYPE_RESTART); - } else { - allowed = ck_check_allowed(type); - } - - gboolean restart_required = FALSE; - if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) { - restart_required = check_restart_required(); - } - - gtk_dialog_add_buttons(GTK_DIALOG(dialog), - _("Cancel"), GTK_RESPONSE_CANCEL, - _(button_strings[type]), GTK_RESPONSE_OK, - NULL); - - return dialog; -} diff --git a/src/gtk-dialog/dialog.h b/src/gtk-dialog/dialog.h deleted file mode 100644 index 3240a8e..0000000 --- a/src/gtk-dialog/dialog.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef __LOGOUT_DIALOG_H__ -#define __LOGOUT_DIALOG_H__ - -#include -#include - -#include - -G_BEGIN_DECLS - -#define LOGOUT_DIALOG_TYPE (logout_dialog_get_type ()) -#define LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOGOUT_DIALOG_TYPE, LogoutDialog)) -#define LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LOGOUT_DIALOG_TYPE, LogoutDialogClass)) -#define IS_LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LOGOUT_DIALOG_TYPE)) -#define IS_LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_DIALOG_TYPE)) -#define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_DIALOG_TYPE, LogoutDialogClass)) - -typedef enum _LogoutDialogType LogoutDialogType; -enum _LogoutDialogType { - LOGOUT_DIALOG_TYPE_LOG_OUT, - LOGOUT_DIALOG_TYPE_RESTART, - LOGOUT_DIALOG_TYPE_SHUTDOWN, - LOGOUT_DIALOG_TYPE_CNT -}; - -typedef struct _LogoutDialog LogoutDialog; -typedef struct _LogoutDialogClass LogoutDialogClass; - -struct _LogoutDialogClass { - GtkMessageDialogClass parent_class; -}; - -struct _LogoutDialog { - GtkMessageDialog parent; -}; - -GType logout_dialog_get_type (void); -LogoutDialog * logout_dialog_new (LogoutDialogType type); - -G_END_DECLS - -#endif diff --git a/src/gtk-dialog/gconf-helper.c b/src/gtk-dialog/gconf-helper.c deleted file mode 100644 index 213592e..0000000 --- a/src/gtk-dialog/gconf-helper.c +++ /dev/null @@ -1,73 +0,0 @@ -/* -A small wrapper utility for connecting to gconf. - -Copyright 2009 Canonical Ltd. - -Authors: - Christoph Korn - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - - -#include - -#include - -#include -#include - -#include -#include - -#include "gconf-helper.h" - -static GConfClient * gconf_client = NULL; - -gboolean -supress_confirmations (void) { - if(!gconf_client) { - gconf_client = gconf_client_get_default (); - } - return gconf_client_get_bool (gconf_client, SUPPRESS_KEY, NULL) ; -} - -static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer data) { - RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = (RestartShutdownLogoutMenuItems*) data; - GConfValue * value = gconf_entry_get_value (entry); - const gchar * key = gconf_entry_get_key (entry); - - if(g_strcmp0 (key, SUPPRESS_KEY) == 0) { - 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")); - } 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...")); - } - } -} - -void -update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) { - if(!gconf_client) { - gconf_client = gconf_client_get_default (); - } - gconf_client_add_dir (gconf_client, GLOBAL_DIR, - GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - gconf_client_notify_add (gconf_client, SUPPRESS_KEY, - update_menu_entries_callback, restart_shutdown_logout_mi, NULL, NULL); -} - diff --git a/src/gtk-dialog/gconf-helper.h b/src/gtk-dialog/gconf-helper.h deleted file mode 100644 index 951bb0f..0000000 --- a/src/gtk-dialog/gconf-helper.h +++ /dev/null @@ -1,50 +0,0 @@ -/* -A small wrapper utility for connecting to gconf. - -Copyright 2009 Canonical Ltd. - -Authors: - Christoph Korn - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - - -#ifndef __GCONF_HELPER_H__ -#define __GCONF_HELPER_H__ 1 - -#include - -#include - -#include -#include - -#include -#include - -#define SUPPRESS_KEY "/apps/indicator-session/suppress_logout_restart_shutdown" -#define GLOBAL_DIR "/apps/indicator-session" - -typedef struct _RestartShutdownLogoutMenuItems -{ - DbusmenuMenuitem * logout_mi; - DbusmenuMenuitem * restart_mi; - DbusmenuMenuitem * shutdown_mi; -} -RestartShutdownLogoutMenuItems; - -void update_menu_entries(RestartShutdownLogoutMenuItems*); -gboolean supress_confirmations (void); - -#endif /* __GCONF_HELPER__ */ diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c deleted file mode 100644 index bf37ca7..0000000 --- a/src/gtk-dialog/gtk-logout-helper.c +++ /dev/null @@ -1,216 +0,0 @@ -/* -A small wrapper utility to load indicators and put them as menu items -into the gnome-panel using it's applet interface. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - Christoph Korn - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - -#include -#include -#include -#include -#include "dialog.h" -#include "gconf-helper.h" - -static void -consolekit_fallback (LogoutDialogType action) -{ - DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL); - g_return_if_fail(sbus != NULL); /* worst case */ - DBusGProxy * proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit", - "/org/freedesktop/ConsoleKit/Manager", - "org.freedesktop.ConsoleKit.Manager"); - - if (proxy == NULL) { - g_warning("Unable to get consolekit proxy"); - return; - } - - GError * error = NULL; - - switch (action) { - case LOGOUT_DIALOG_TYPE_LOG_OUT: - 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_TYPE_SHUTDOWN: - dbus_g_proxy_call(proxy, - "Stop", - &error, - G_TYPE_INVALID); - break; - case LOGOUT_DIALOG_TYPE_RESTART: - dbus_g_proxy_call(proxy, - "Restart", - &error, - G_TYPE_INVALID); - break; - default: - g_warning("Unknown action"); - break; - } - - g_object_unref(proxy); - - if (error != NULL) { - g_error("Unable to signal ConsoleKit: %s", error->message); - g_error_free(error); - } - - return; -} - -static void -session_action (LogoutDialogType action) -{ - DBusGConnection * sbus; - DBusGProxy * sm_proxy; - GError * error = NULL; - gboolean res = FALSE; - - sbus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); - if (sbus == NULL) { - g_warning("Unable to get DBus session bus."); - return; - } - sm_proxy = dbus_g_proxy_new_for_name_owner (sbus, - "org.gnome.SessionManager", - "/org/gnome/SessionManager", - "org.gnome.SessionManager", - &error); - if (sm_proxy == NULL) { - g_warning("Unable to get DBus proxy to SessionManager interface: %s", error->message); - g_error_free(error); - - consolekit_fallback(action); - return; - } - - g_clear_error (&error); - - if (action == LOGOUT_DIALOG_TYPE_LOG_OUT) { - res = dbus_g_proxy_call_with_timeout (sm_proxy, "Logout", INT_MAX, &error, - G_TYPE_UINT, 1, G_TYPE_INVALID, G_TYPE_INVALID); - } else if (action == LOGOUT_DIALOG_TYPE_SHUTDOWN) { - res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestShutdown", INT_MAX, &error, - G_TYPE_INVALID, G_TYPE_INVALID); - } else if (action == LOGOUT_DIALOG_TYPE_RESTART) { - res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestReboot", INT_MAX, &error, - G_TYPE_INVALID, G_TYPE_INVALID); - } else { - g_warning ("Unknown session action"); - } - - if (!res) { - if (error != NULL) { - g_warning ("SessionManager action failed: %s", error->message); - } else { - g_warning ("SessionManager action failed: unknown error"); - } - } - - g_object_unref(sm_proxy); - - if (error != NULL) { - g_error_free(error); - } - - return; -} - -static LogoutDialogType type = LOGOUT_DIALOG_TYPE_LOG_OUT; - -static gboolean -option_logout (const gchar * arg, const gchar * value, gpointer data, GError * error) -{ - type = LOGOUT_DIALOG_TYPE_LOG_OUT; - return TRUE; -} - -static gboolean -option_shutdown (const gchar * arg, const gchar * value, gpointer data, GError * error) -{ - type = LOGOUT_DIALOG_TYPE_SHUTDOWN; - return TRUE; -} - -static gboolean -option_restart (const gchar * arg, const gchar * value, gpointer data, GError * error) -{ - type = LOGOUT_DIALOG_TYPE_RESTART; - return TRUE; -} - -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}, - {"restart", 'r', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_restart, "Restart the system", NULL}, - - {NULL} -}; - -int -main (int argc, char * argv[]) -{ - gtk_init(&argc, &argv); - - /* Setting up i18n and gettext. Apparently, we need - all of these. */ - setlocale (LC_ALL, ""); - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); - textdomain (GETTEXT_PACKAGE); - - GError * error = NULL; - GOptionContext * context = g_option_context_new(" - logout of the current session"); - g_option_context_add_main_entries(context, options, "gtk-logout-helper"); - g_option_context_add_group(context, gtk_get_option_group(TRUE)); - g_option_context_set_help_enabled(context, TRUE); - - if (!g_option_context_parse(context, &argc, &argv, &error)) { - g_debug("Option parsing failed: %s", error->message); - g_error_free(error); - return 1; - } - - /* Init some theme/icon stuff */ - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), - INDICATOR_ICONS_DIR); - - GtkWidget * dialog = NULL; - if (!supress_confirmations()) { - dialog = GTK_WIDGET(logout_dialog_new(type)); - } - - if (dialog != NULL) { - GtkResponseType response = gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_hide(dialog); - - if (response == GTK_RESPONSE_HELP) { - type = LOGOUT_DIALOG_TYPE_RESTART; - response = GTK_RESPONSE_OK; - } - - if (response != GTK_RESPONSE_OK) { - return 0; - } - } - - session_action(type); - - return 0; -} diff --git a/src/gtk-logout-helper.c b/src/gtk-logout-helper.c new file mode 100644 index 0000000..bf37ca7 --- /dev/null +++ b/src/gtk-logout-helper.c @@ -0,0 +1,216 @@ +/* +A small wrapper utility to load indicators and put them as menu items +into the gnome-panel using it's applet interface. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + Christoph Korn + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + +#include +#include +#include +#include +#include "dialog.h" +#include "gconf-helper.h" + +static void +consolekit_fallback (LogoutDialogType action) +{ + DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL); + g_return_if_fail(sbus != NULL); /* worst case */ + DBusGProxy * proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit", + "/org/freedesktop/ConsoleKit/Manager", + "org.freedesktop.ConsoleKit.Manager"); + + if (proxy == NULL) { + g_warning("Unable to get consolekit proxy"); + return; + } + + GError * error = NULL; + + switch (action) { + case LOGOUT_DIALOG_TYPE_LOG_OUT: + 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_TYPE_SHUTDOWN: + dbus_g_proxy_call(proxy, + "Stop", + &error, + G_TYPE_INVALID); + break; + case LOGOUT_DIALOG_TYPE_RESTART: + dbus_g_proxy_call(proxy, + "Restart", + &error, + G_TYPE_INVALID); + break; + default: + g_warning("Unknown action"); + break; + } + + g_object_unref(proxy); + + if (error != NULL) { + g_error("Unable to signal ConsoleKit: %s", error->message); + g_error_free(error); + } + + return; +} + +static void +session_action (LogoutDialogType action) +{ + DBusGConnection * sbus; + DBusGProxy * sm_proxy; + GError * error = NULL; + gboolean res = FALSE; + + sbus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + if (sbus == NULL) { + g_warning("Unable to get DBus session bus."); + return; + } + sm_proxy = dbus_g_proxy_new_for_name_owner (sbus, + "org.gnome.SessionManager", + "/org/gnome/SessionManager", + "org.gnome.SessionManager", + &error); + if (sm_proxy == NULL) { + g_warning("Unable to get DBus proxy to SessionManager interface: %s", error->message); + g_error_free(error); + + consolekit_fallback(action); + return; + } + + g_clear_error (&error); + + if (action == LOGOUT_DIALOG_TYPE_LOG_OUT) { + res = dbus_g_proxy_call_with_timeout (sm_proxy, "Logout", INT_MAX, &error, + G_TYPE_UINT, 1, G_TYPE_INVALID, G_TYPE_INVALID); + } else if (action == LOGOUT_DIALOG_TYPE_SHUTDOWN) { + res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestShutdown", INT_MAX, &error, + G_TYPE_INVALID, G_TYPE_INVALID); + } else if (action == LOGOUT_DIALOG_TYPE_RESTART) { + res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestReboot", INT_MAX, &error, + G_TYPE_INVALID, G_TYPE_INVALID); + } else { + g_warning ("Unknown session action"); + } + + if (!res) { + if (error != NULL) { + g_warning ("SessionManager action failed: %s", error->message); + } else { + g_warning ("SessionManager action failed: unknown error"); + } + } + + g_object_unref(sm_proxy); + + if (error != NULL) { + g_error_free(error); + } + + return; +} + +static LogoutDialogType type = LOGOUT_DIALOG_TYPE_LOG_OUT; + +static gboolean +option_logout (const gchar * arg, const gchar * value, gpointer data, GError * error) +{ + type = LOGOUT_DIALOG_TYPE_LOG_OUT; + return TRUE; +} + +static gboolean +option_shutdown (const gchar * arg, const gchar * value, gpointer data, GError * error) +{ + type = LOGOUT_DIALOG_TYPE_SHUTDOWN; + return TRUE; +} + +static gboolean +option_restart (const gchar * arg, const gchar * value, gpointer data, GError * error) +{ + type = LOGOUT_DIALOG_TYPE_RESTART; + return TRUE; +} + +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}, + {"restart", 'r', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_restart, "Restart the system", NULL}, + + {NULL} +}; + +int +main (int argc, char * argv[]) +{ + gtk_init(&argc, &argv); + + /* Setting up i18n and gettext. Apparently, we need + all of these. */ + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + textdomain (GETTEXT_PACKAGE); + + GError * error = NULL; + GOptionContext * context = g_option_context_new(" - logout of the current session"); + g_option_context_add_main_entries(context, options, "gtk-logout-helper"); + g_option_context_add_group(context, gtk_get_option_group(TRUE)); + g_option_context_set_help_enabled(context, TRUE); + + if (!g_option_context_parse(context, &argc, &argv, &error)) { + g_debug("Option parsing failed: %s", error->message); + g_error_free(error); + return 1; + } + + /* Init some theme/icon stuff */ + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), + INDICATOR_ICONS_DIR); + + GtkWidget * dialog = NULL; + if (!supress_confirmations()) { + dialog = GTK_WIDGET(logout_dialog_new(type)); + } + + if (dialog != NULL) { + GtkResponseType response = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_hide(dialog); + + if (response == GTK_RESPONSE_HELP) { + type = LOGOUT_DIALOG_TYPE_RESTART; + response = GTK_RESPONSE_OK; + } + + if (response != GTK_RESPONSE_OK) { + return 0; + } + } + + session_action(type); + + return 0; +} diff --git a/src/session-service.c b/src/session-service.c index 289bff8..af3c3e5 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -40,7 +40,7 @@ with this program. If not, see . #include "dbus-shared-names.h" #include "dbusmenu-shared.h" -#include "gtk-dialog/gconf-helper.h" +#include "gconf-helper.h" #include "users-service-dbus.h" #include "lock-helper.h" -- cgit v1.2.3 From 2ae450d4f50ed3da4383ad5e4fcd470986deee3b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 16:18:00 -0600 Subject: Filling in the code to check and see if we can restart or stop. --- src/dialog.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/dialog.c b/src/dialog.c index 7e2347e..6dd7a90 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -4,6 +4,7 @@ #include +#include "consolekit-manager-client.h" #include "dialog.h" /* Strings */ @@ -106,10 +107,30 @@ check_restart_required (void) static gboolean ck_check_allowed (LogoutDialogType type) { + DBusGConnection * system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL); + g_return_val_if_fail(system_bus != NULL, TRUE); + + DBusGProxy * ck_proxy = dbus_g_proxy_new_for_name (system_bus, + "org.freedesktop.ConsoleKit", + "/org/freedesktop/ConsoleKit/Manager", + "org.freedesktop.ConsoleKit.Manager"); + g_return_val_if_fail(ck_proxy != NULL, TRUE); + + gboolean retval = TRUE; + switch (type) { + case LOGOUT_DIALOG_TYPE_RESTART: + org_freedesktop_ConsoleKit_Manager_can_restart(ck_proxy, &retval, NULL); + break; + case LOGOUT_DIALOG_TYPE_SHUTDOWN: + org_freedesktop_ConsoleKit_Manager_can_stop(ck_proxy, &retval, NULL); + break; + default: + break; + } + g_object_unref(ck_proxy); - - return TRUE; + return retval; } LogoutDialog * -- cgit v1.2.3 From a76563f00527498fd4121d2b824ef622bc062985 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 16:38:44 -0600 Subject: Adding in different button strings if we need authentication. --- src/dialog.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/dialog.c b/src/dialog.c index 6dd7a90..dd681b3 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -27,6 +27,14 @@ static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off") }; +/* TRANSLATORS: These strings have an ellipsis so that the user knows + they are also going to get a password dialog to do the action. */ +static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = { + /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"), + /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart..."), + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Switch Off...") +}; + /* static const gchar * restart_updates = N_("Restart Instead"); static const gchar * restart_auth = N_("Restart..."); @@ -165,9 +173,16 @@ logout_dialog_new (LogoutDialogType type) restart_required = check_restart_required(); } + const gchar * button_text; + if (allowed) { + button_text = _(button_strings[type]); + } else { + button_text = _(button_auth_strings[type]); + } + gtk_dialog_add_buttons(GTK_DIALOG(dialog), _("Cancel"), GTK_RESPONSE_CANCEL, - _(button_strings[type]), GTK_RESPONSE_OK, + button_text, GTK_RESPONSE_OK, NULL); return dialog; -- cgit v1.2.3 From 3928d091aaa4beacbf86dfc51b5ccc04c9ee4b36 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 16:55:50 -0600 Subject: Checking to see if we need updates and allowing that on logout dialogs. --- src/dialog.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/dialog.c b/src/dialog.c index dd681b3..f30eb17 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -35,11 +35,9 @@ static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Switch Off...") }; -/* static const gchar * restart_updates = N_("Restart Instead"); static const gchar * restart_auth = N_("Restart..."); static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts."); -*/ static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ "system-log-out", @@ -107,8 +105,7 @@ logout_dialog_finalize (GObject *object) static gboolean check_restart_required (void) { - - return FALSE; + return g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS); } /* Checks with console kit to see if we can do what we want */ @@ -180,10 +177,27 @@ logout_dialog_new (LogoutDialogType type) button_text = _(button_auth_strings[type]); } - gtk_dialog_add_buttons(GTK_DIALOG(dialog), - _("Cancel"), GTK_RESPONSE_CANCEL, - button_text, GTK_RESPONSE_OK, - NULL); + if (restart_required) { + const gchar * restart_req; + if (allowed) { + restart_req = restart_updates; + } else { + restart_req = restart_auth; + } + + g_object_set(dialog, "secondary-text", _(body_logout_update), NULL); + + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + _(restart_req), GTK_RESPONSE_HELP, + _("Cancel"), GTK_RESPONSE_CANCEL, + button_text, GTK_RESPONSE_OK, + NULL); + } else { + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + _("Cancel"), GTK_RESPONSE_CANCEL, + button_text, GTK_RESPONSE_OK, + NULL); + } return dialog; } -- cgit v1.2.3 From 8d96a4fc56e194b1c4e8b1370d1a35703b92a3fe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 16:57:37 -0600 Subject: String fixes and a comment. --- src/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dialog.c b/src/dialog.c index f30eb17..b63ecef 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -35,8 +35,11 @@ static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Switch Off...") }; +/* TRANSLATORS: This button appears on the logout dialog when + there are updates that require restart. It will do a restart + in place of a log out. */ static const gchar * restart_updates = N_("Restart Instead"); -static const gchar * restart_auth = N_("Restart..."); +static const gchar * restart_auth = N_("Restart Instead..."); static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts."); static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = { -- cgit v1.2.3 From 10e1e69dae2be7388dca78a253173e3e5e9e3641 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 17:00:45 -0600 Subject: Setting the default button. --- src/dialog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dialog.c b/src/dialog.c index b63ecef..fcc3334 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -202,5 +202,7 @@ logout_dialog_new (LogoutDialogType type) NULL); } + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); + return dialog; } -- cgit v1.2.3 From edeb525d966748a31e0abd7526c84c59f5c0e365 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 20:36:18 -0600 Subject: Slightly longer string for better wrapping. --- src/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dialog.c b/src/dialog.c index fcc3334..3e3799d 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -16,7 +16,7 @@ static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = { }; static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = { - /* LOGOUT_DIALOG_LOGOUT, */ N_("Are you sure you want to close all programs and log out?"), + /* LOGOUT_DIALOG_LOGOUT, */ N_("Are you sure you want to close all programs and log out of the computer?"), /* LOGOUT_DIALOG_RESTART, */ N_("Are you sure you want to close all programs and restart the computer?"), /* LOGOUT_DIALOG_SHUTDOWN, */ N_("Are you sure you want to close all programs and shut down the computer?") }; -- cgit v1.2.3 From 25e5df53f5584fa04ff0f9949f619f9031acc4a1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 20:37:47 -0600 Subject: Copyright headers --- src/dialog.c | 22 ++++++++++++++++++++++ src/dialog.h | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/src/dialog.c b/src/dialog.c index 3e3799d..deefe0b 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1,3 +1,25 @@ +/* +A dialog to ask the user about the various logout options that +are available. + +Copyright 2010 Canonical Ltd. + +Authors: + Ted Gould + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/dialog.h b/src/dialog.h index 3240a8e..18a55a7 100644 --- a/src/dialog.h +++ b/src/dialog.h @@ -1,3 +1,25 @@ +/* +A dialog to ask the user about the various logout options that +are available. + +Copyright 2010 Canonical Ltd. + +Authors: + Ted Gould + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + #ifndef __LOGOUT_DIALOG_H__ #define __LOGOUT_DIALOG_H__ -- cgit v1.2.3 From 2aeb4a3c7a9dc8821361aac9fc2db6494a7b45cd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 20:47:35 -0600 Subject: LGPL not needed with dropping the logout-dialog.c file. --- COPYING.LGPL | 481 ----------------------------------------------------------- Makefile.am | 2 +- 2 files changed, 1 insertion(+), 482 deletions(-) delete mode 100644 COPYING.LGPL diff --git a/COPYING.LGPL b/COPYING.LGPL deleted file mode 100644 index 2676d08..0000000 --- a/COPYING.LGPL +++ /dev/null @@ -1,481 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/Makefile.am b/Makefile.am index 3d97874..39b5cdb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = \ data \ po -EXTRA_DIST = COPYING.LGPL autogen.sh +EXTRA_DIST = autogen.sh DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall -- cgit v1.2.3 From be3f65e45fb928f6afe189fe41ab7a25243d1d90 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 21:50:37 -0600 Subject: Adds a file watcher to see if we should change the menuitem to warn that a restart is recommended. --- src/session-service.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/session-service.c b/src/session-service.c index eb1966e..62ee0a7 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -27,6 +27,7 @@ with this program. If not, see . #include #include +#include #include #include @@ -605,6 +606,42 @@ service_shutdown (IndicatorService * service, gpointer user_data) return; } +static void +restart_dir_changed (void) +{ + gboolean restart_required = g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS); + + if (restart_required) { + if (supress_confirmations()) { + dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required")); + } else { + dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required...")); + } + dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important"); + } else { + if (supress_confirmations()) { + dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); + } else { + dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); + } + dbusmenu_menuitem_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME); + } + + return; +} + +static void +setup_restart_watch (void) +{ + GFile * filedir = g_file_new_for_path("/var/run"); + GFileMonitor * filemon = g_file_monitor_directory(filedir, G_FILE_MONITOR_NONE, NULL, NULL); + if (filemon != NULL) { + g_signal_connect(G_OBJECT(filemon), "changed", G_CALLBACK(restart_dir_changed), NULL); + } + restart_dir_changed(); + return; +} + /* Main, is well, main. It brings everything up and throws us into the mainloop of no return. */ int @@ -642,6 +679,8 @@ main (int argc, char ** argv) G_CALLBACK (user_change), root_menuitem); + setup_restart_watch(); + setup_up(); DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT); -- cgit v1.2.3 From d018794d6717df1f4dfcb1f26258d6cd2820d8bd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 3 Mar 2010 21:51:57 -0600 Subject: Some function comments. --- src/session-service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/session-service.c b/src/session-service.c index 62ee0a7..7183472 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -606,6 +606,8 @@ service_shutdown (IndicatorService * service, gpointer user_data) return; } +/* When the directory changes we need to figure out how our menu + item should look. */ static void restart_dir_changed (void) { @@ -630,6 +632,9 @@ restart_dir_changed (void) return; } +/* Buids a file watcher for the directory so that when it + changes we can check to see if our reboot-required is + there. */ static void setup_restart_watch (void) { -- cgit v1.2.3 From 2b85f39462428c849c00b16ac35e2197d8cb51f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 4 Mar 2010 12:16:23 -0600 Subject: 0.2.5 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0faca94..f79fa93 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.4) +AM_INIT_AUTOMAKE(indicator-session, 0.2.5) AM_MAINTAINER_MODE -- cgit v1.2.3 From afd8f167348488a10b4de2c52bdcee4f47db7e80 Mon Sep 17 00:00:00 2001 From: Kyle Nitzsche Date: Wed, 10 Mar 2010 17:40:23 -0500 Subject: add LINGUAS with 31 languages and corresponding 31 po files, which adds 14 strings (10 fuzzy, 8 untransalted) --- po/LINGUAS | 31 +++++++++ po/ar.po | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/bg.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/da.po | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/es.po | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/fi.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/hr.po | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/hu.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/nb.po | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/pl.po | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt.po | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/ro.po | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/sl.po | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr.po | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/sv.po | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/th.po | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/tr.po | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 32 files changed, 6657 insertions(+) create mode 100644 po/LINGUAS create mode 100644 po/ar.po create mode 100644 po/bg.po create mode 100644 po/cs.po create mode 100644 po/da.po create mode 100644 po/de.po create mode 100644 po/el.po create mode 100644 po/es.po create mode 100644 po/fi.po create mode 100644 po/fr.po create mode 100644 po/he.po create mode 100644 po/hi.po create mode 100644 po/hr.po create mode 100644 po/hu.po create mode 100644 po/it.po create mode 100644 po/ja.po create mode 100644 po/ko.po create mode 100644 po/nb.po create mode 100644 po/nl.po create mode 100644 po/pl.po create mode 100644 po/pt.po create mode 100644 po/pt_BR.po create mode 100644 po/ro.po create mode 100644 po/ru.po create mode 100644 po/sk.po create mode 100644 po/sl.po create mode 100644 po/sr.po create mode 100644 po/sv.po create mode 100644 po/th.po create mode 100644 po/tr.po create mode 100644 po/zh_CN.po create mode 100644 po/zh_TW.po diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..dd5940e --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,31 @@ +ar +bg +cs +da +de +el +es +fi +fr +he +hi +hr +hu +it +ja +ko +nb +nl +pl +pt +pt_BR +ro +ru +sk +sl +sr +sv +th +tr +zh_CN +zh_TW diff --git a/po/ar.po b/po/ar.po new file mode 100644 index 0000000..0ccc6e7 --- /dev/null +++ b/po/ar.po @@ -0,0 +1,224 @@ +# Arabic translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Arabic\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "إخفاء مربع حوار تأكيد إجراء الخروج إعادة التشغيل والإيقاف" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"سواء ظهرت أو لم تظهر إجراءات مربعات حوار تأكيد الخروج وإعادة التشغيل " +"والإيقاف ." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "تسجيل الخروج" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "إعادة التشغيل" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "إيقاف التشغيل" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "تسجيل الخروج" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "إعادة التشغيل..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "إيقاف تشغيل..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "تسجيل الخروج" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "إعادة التشغيل" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "إيقاف التشغيل" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "تسجيل الخروج" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "إعادة التشغيل" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "إيقاف التشغيل" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "تسجيل الخروج" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "إعادة التشغيل..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "إيقاف تشغيل..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "إعادة التشغيل" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "إعادة التشغيل..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "تبديل المستخدم..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "التحول من %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "النوم" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "إعادة التشغيل" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "إعادة التشغيل..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "قمت مؤخرا بتثبيت تحديثات لن تنفذ إلا بعد إعادة التشغيل. قم بإعادة " +#~ "التشغيل لتطبيق تحديثات البرامج." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "سيتم تسجيل خروجك خلال %d ثانية." +#~ msgstr[1] "سيتم تسجيل خروجك خلال %d ثانية." +#~ msgstr[2] "سيتم تسجيل خروجك خلال %d ثانية." +#~ msgstr[3] "سيتم تسجيل خروجك خلال %d ثانية." +#~ msgstr[4] "سيتم تسجيل خروجك خلال %d ثانية." +#~ msgstr[5] "سيتم تسجيل خروجك خلال %d ثانية." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "سيتم إعادة تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[1] "سيتم إعادة تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[2] "سيتم إعادة تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[3] "سيتم إعادة تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[4] "سيتم إعادة تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[5] "سيتم إعادة تشغيل الكمبيوتر خلال %d ثانية." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "سيتم إيقاف تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[1] "سيتم إيقاف تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[2] "سيتم إيقاف تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[3] "سيتم إيقاف تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[4] "سيتم إيقاف تشغيل الكمبيوتر خلال %d ثانية." +#~ msgstr[5] "سيتم إيقاف تشغيل الكمبيوتر خلال %d ثانية." diff --git a/po/bg.po b/po/bg.po new file mode 100644 index 0000000..eb05e8f --- /dev/null +++ b/po/bg.po @@ -0,0 +1,214 @@ +# Bulgarian translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Bulgarian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Да не се показва диалог за потвърждение при излизане, рестартиране и " +"изключване" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Дали да се показва или не диалог за потвърждение при излизане, рестартиране " +"и изключване " + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Излизане" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Рестартиране" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Изключване" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Излизане" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Рестартиране..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Изключване..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Излизане" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Рестартиране" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Изключване" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Излизане" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Рестартиране" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Изключване" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Излизане" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Рестартиране..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Изключване..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Рестартиране" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Рестартиране..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Превключване на потребител..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Превключване от %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Спящ режим" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Рестартиране" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Рестартиране..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Наскоро инсталирахте обновления, които ще започнат действие само след " +#~ "рестартиране. Рестартирайте, за да влязат в сила обновленията на " +#~ "софтуера." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Ще излезете от системата след %d секунда." +#~ msgstr[1] "Ще излезете от системата след %d секунди." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Компютърът ще се рестартира след %d секунда." +#~ msgstr[1] "Компютърът ще се рестартира след %d секунди." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Компютърът ще се изключи след %d секунда." +#~ msgstr[1] "Компютърът ще се изключи след %d секунди." diff --git a/po/cs.po b/po/cs.po new file mode 100644 index 0000000..ecc531f --- /dev/null +++ b/po/cs.po @@ -0,0 +1,214 @@ +# Czech translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Czech\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "Potlačit dialogové okno pro potvrzení odhlášení restartování a vypnutí" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Určuje, zda se mají či nemají zobrazovat potvrzující dialogová okna při " +"odhlášení, restartování a vypnutí." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Odhlásit" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Restartovat" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Vypnout" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Odhlásit" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Restartovat..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Vypnout..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Odhlásit" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Restartovat" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Vypnout" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Odhlásit" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Restartovat" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Vypnout" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Odhlásit" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Restartovat..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Vypnout..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Restartovat" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Restartovat..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Přepnout uživatele..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Přepnout z %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Režim spánku" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Restartovat" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Restartovat..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Před nedávnem jste nainstalovali aktualizace, které se projeví až po " +#~ "restartování. Restartováním použijte softwarové aktualizace." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Budete odhlášeni za %d s." +#~ msgstr[1] "Budete odhlášeni za %d s." +#~ msgstr[2] "Budete odhlášeni za %d s." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Počítač se restartuje za %d s." +#~ msgstr[1] "Počítač se restartuje za %d s." +#~ msgstr[2] "Počítač se restartuje za %d s." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Počítač se vypne za %d s." +#~ msgstr[1] "Počítač se vypne za %d s." +#~ msgstr[2] "Počítač se vypne za %d s." diff --git a/po/da.po b/po/da.po new file mode 100644 index 0000000..3ae532d --- /dev/null +++ b/po/da.po @@ -0,0 +1,213 @@ +# Danish translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Danish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Vis ikke dialogboksen til bekræftelse af handlingerne logout, genstart og " +"lukning" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Angiver, om der skal vises bekræftelsesdialogbokse for handlingerne logout, " +"genstart og lukning." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Log af" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Genstart" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Sluk" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Log af" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Genstart..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Sluk..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Log af" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Genstart" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Sluk" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Log af" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Genstart" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Sluk" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Log af" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Genstart..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Sluk..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Genstart" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Genstart..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Skift bruger..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Skift fra %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Dvale" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Genstart" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Genstart..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Du har for nylig installeret opdateringer, som først træder i kraft efter " +#~ "en genstart. Genstart, så softwareopdateringerne træder i kraft." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Du vil blive logget ud om %d sekund." +#~ msgstr[1] "Du vil blive logget ud om %d sekunder." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Computeren genstarter om %d sekund." +#~ msgstr[1] "Computeren genstarter om %d sekunder." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Computeren lukkes om %d sekund." +#~ msgstr[1] "Computeren lukkes om %d sekunder." diff --git a/po/de.po b/po/de.po new file mode 100644 index 0000000..3dc08ec --- /dev/null +++ b/po/de.po @@ -0,0 +1,213 @@ +# German translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: German\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Dialog unterdrücken, der die Aktionen Abmelden, Neustart und Herunterfahren " +"bestätigt." + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Ein- oder Ausblenden des Bestätigungsdialogs für die Aktionen Abmelden, " +"Neustart und Herunterfahren." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Abmelden" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Neu starten" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Abschalten" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Abmelden" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Neu starten..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Abschalten..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Abmelden" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Neu starten" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Abschalten" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Abmelden" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Neu starten" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Abschalten" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Abmelden" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Neu starten..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Abschalten..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Neu starten" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Neu starten..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Benutzer wechseln..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Wechseln von %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Ruhe" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Neu starten" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Neu starten..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Sie haben vor kurzem Updates installiert, die erst nach einem Neustart " +#~ "wirksam werden. Starten Sie neu, um Softwareupdates zu übernehmen." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Sie werden in %d Sekunde abgemeldet." +#~ msgstr[1] "Sie werden in %d Sekunden abgemeldet." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Der Computer startet in %d Sekunde neu." +#~ msgstr[1] "Der Computer startet in %d Sekunden neu." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Der Computer schaltet sich in %d Sekunde aus." +#~ msgstr[1] "Der Computer schaltet sich in %d Sekunden aus." diff --git a/po/el.po b/po/el.po new file mode 100644 index 0000000..b63ff1f --- /dev/null +++ b/po/el.po @@ -0,0 +1,214 @@ +# Greek translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Greek\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Απόκρυψη του παραθύρου διαλόγου επιβεβαίωσης της ενέργειας αποσύνδεσης, " +"επανεκκίνησης ή τερματισμού λειτουργίας" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Εάν θα εμφανίζονται ή όχι παράθυρα διαλόγου επιβεβαίωσης για τις ενέργειες " +"αποσύνδεσης, επανεκκίνησης και τερματισμού λειτουργίας ." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Αποσύνδεση" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Επανεκκίνηση" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Απενεργοποίηση" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Αποσύνδεση" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Επανεκκίνηση..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Απενεργοποίηση..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Αποσύνδεση" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Επανεκκίνηση" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Απενεργοποίηση" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Αποσύνδεση" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Επανεκκίνηση" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Απενεργοποίηση" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Αποσύνδεση" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Επανεκκίνηση..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Απενεργοποίηση..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Επανεκκίνηση" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Επανεκκίνηση..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Αλλαγή χρήστη..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Αλλαγή από %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Αναστολή λειτουργίας" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Επανεκκίνηση" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Επανεκκίνηση..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Εγκαταστήσατε πρόσφατα ενημερώσεις, οι οποίες θα τεθούν σε ισχύ μετά την " +#~ "επανεκκίνηση. Πραγματοποιήστε επανεκκίνηση για να εφαρμοστούν οι " +#~ "ενημερώσεις λογισμικού." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Θα αποσυνδεθείτε σε %d δευτερόλεπτο." +#~ msgstr[1] "Θα αποσυνδεθείτε σε %d δευτερόλεπτα." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Ο υπολογιστής θα εκτελέσει επανεκκίνηση σε %d δευτερόλεπτο." +#~ msgstr[1] "Ο υπολογιστής θα εκτελέσει επανεκκίνηση σε %d δευτερόλεπτα." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Η λειτουργία του υπολογιστή θα τερματιστεί σε %d δευτερόλεπτο." +#~ msgstr[1] "Η λειτουργία του υπολογιστή θα τερματιστεί σε %d δευτερόλεπτα." diff --git a/po/es.po b/po/es.po new file mode 100644 index 0000000..b3e36df --- /dev/null +++ b/po/es.po @@ -0,0 +1,212 @@ +# Spanish translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Spanish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Desactivar el diálogo para confirmar acción de desconexión, reinicio y cierre" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Determina si se muestran o no diálogos de confirmación para desconectarse, " +"reiniciar o cerrar." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Cerrar sesión" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Reiniciar" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Apagar" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Cerrar sesión" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Reiniciar..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Apagar..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Cerrar sesión" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Reiniciar" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Apagar" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Cerrar sesión" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Reiniciar" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Apagar" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Cerrar sesión" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Reiniciar..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Apagar..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Reiniciar" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Reiniciar..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Cambiar usuario..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Cambiar desde %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Reposo" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Reiniciar" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Reiniciar..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Recientemente ha instalado actualizaciones que surtirán efecto sólo si " +#~ "reinicia. Reiniciar para aplicar actualizaciones de software." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Se desconectará en %d segundo." +#~ msgstr[1] "Se desconectará en %d segundos." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "El equipo se reiniciará en %d segundo." +#~ msgstr[1] "El equipo se reiniciará en %d segundos." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "El equipo se apagará en %d segundo." +#~ msgstr[1] "El equipo se apagará en %d segundos." diff --git a/po/fi.po b/po/fi.po new file mode 100644 index 0000000..9f0747c --- /dev/null +++ b/po/fi.po @@ -0,0 +1,214 @@ +# Finnish translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Finnish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Poista uloskirjauksen, uudelleenkäynnistyksen ja sammuttamisen valintaikkuna " +"käytöstä" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Valitse, näytetäänkö uudelleenkäynnistyksestä, saammuttamisesta ja " +"uloskirjauksesta vahvistus. " + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Uloskirjaus" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Käynnistä uudelleen" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Sammuta" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Uloskirjaus" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Käynnistä uudelleen..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Sammuta..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Uloskirjaus" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Käynnistä uudelleen" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Sammuta" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Uloskirjaus" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Käynnistä uudelleen" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Sammuta" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Uloskirjaus" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Käynnistä uudelleen..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Sammuta..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Käynnistä uudelleen" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Käynnistä uudelleen..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Vaihda käyttäjä..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Vaihda kohteesta %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Lepotila" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Käynnistä uudelleen" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Käynnistä uudelleen..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Asentamasi päivitykset tulevat käyttöön, kun tietokone käynnistetään " +#~ "uudelleen. Voit ottaa ohjelmistopäivitykset käyttöön käynnistämällä " +#~ "uudelleen." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Sinut kirjataan ulos %d sekunnin kuluttua." +#~ msgstr[1] "Sinut kirjataan ulos %d sekunnin kuluttua." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Tietokone käynnistyy uudelleen %d sekunnin kuluttua." +#~ msgstr[1] "Tietokone käynnistyy uudelleen %d sekunnin kuluttua." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Tietokoneesta katkaistaan virta %d sekunnin kuluttua." +#~ msgstr[1] "Tietokoneesta katkaistaan virta %d sekunnin kuluttua." diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 0000000..d1788f1 --- /dev/null +++ b/po/fr.po @@ -0,0 +1,214 @@ +# French translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: French\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Supprimer la boîte de dialogue pour confirmer la déconnexion, le redémarrage " +"et l'arrêt" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Afficher ou non les boîtes des dialogue de confirmation de déconnexion, de " +"redémarrage et d'arrêt" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Déconnexion" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Redémarrer" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Eteindre" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Déconnexion" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Redémarrer..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Eteindre..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Déconnexion" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Redémarrer" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Eteindre" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Déconnexion" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Redémarrer" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Eteindre" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Déconnexion" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Redémarrer..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Eteindre..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Redémarrer" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Redémarrer..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Changer d'utilisateur..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Passer de %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Veille" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Redémarrer" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Redémarrer..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Vous avez récemment installé des mises à jour qui nécessitent le " +#~ "redémarrage de l'ordinateur. Redémarrez l'ordinateur pour appliquer les " +#~ "mises à jour logicielles." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Vous allez être déconnecté dans %d seconde." +#~ msgstr[1] "Vous allez être déconnecté dans %d secondes." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "L'ordinateur va redémarrer dans %d seconde." +#~ msgstr[1] "L'ordinateur va redémarrer dans %d secondes." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "L'ordinateur va s'éteindre dans %d seconde." +#~ msgstr[1] "L'ordinateur va s'éteindre dans %d secondes." diff --git a/po/he.po b/po/he.po new file mode 100644 index 0000000..c32c6b3 --- /dev/null +++ b/po/he.po @@ -0,0 +1,210 @@ +# Hebrew translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Hebrew\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "העלם את תיבת הדו-שיח כדי לצאת, להפעיל מחדש או לכבות את הפעולה" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"האם להציג או לא להציג תיבות דו-שיח לאישור יציאה, הפעלה מחדש או כיבוי פעולות." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "יציאה" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "הפעלה מחדש" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "כיבוי" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "יציאה" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "הפעלה מחדש..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "כיבוי..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "יציאה" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "הפעלה מחדש" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "כיבוי" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "יציאה" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "הפעלה מחדש" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "כיבוי" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "יציאה" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "הפעלה מחדש..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "כיבוי..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "הפעלה מחדש" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "הפעלה מחדש..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "החלפת משתמש..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "החלפה מ%s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "מצב שינה" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "הפעלה מחדש" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "הפעלה מחדש..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "התקנת לאחרונה עדכונים אשר ייכנסו לתוקף רק לאחר הפעלה מחדש. הפעל מחדש כדי " +#~ "לחיל עדכוני תוכנה." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "תנותק בעוד %d שניות." +#~ msgstr[1] "תנותק בעוד %d שניות" + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "המחשב יופעל מחדש בעוד %d שניות." +#~ msgstr[1] "המחשב יופעל מחדש בעוד %d שניות." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "המחשב ייכבה בעוד %d שניות." +#~ msgstr[1] "המחשב ייכבה בעוד %d שניות." diff --git a/po/hi.po b/po/hi.po new file mode 100644 index 0000000..858d32d --- /dev/null +++ b/po/hi.po @@ -0,0 +1,209 @@ +# Hindi translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Hindi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "लॉगआउट, पुनः प्रारंभ और शटडाउन क्रिया की पुष्टि करने के लिए संवाद दबाएं" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "लॉगआउट, पुनः प्रारंभ और शटडाउन के लिए पुष्टिकरण संवाद दिखाएं या नहीं क्रियाएं." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "लॉगआउट करें" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "पुनः प्रारंभ करें" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "बंद करें" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "लॉगआउट करें" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "पुनः प्रारंभ करें..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "बंद करें..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "लॉगआउट करें" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "पुनः प्रारंभ करें" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "बंद करें" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "लॉग आउट करें" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "पुनः प्रारंभ करें" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "बंद करें" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "लॉगआउट करें" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "पुनः प्रारंभ करें..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "बंद करें..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "पुनः प्रारंभ करें" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "पुनः प्रारंभ करें..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "उपयोगकर्ता को स्विच करें..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "%s से स्विच करें..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "स्लीप" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "पुनः प्रारंभ करें" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "पुनः प्रारंभ करें..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "आपने हाल ही में अपडेट स्थापित किए हैं जो केवल एक पुनः प्रारंभ के बाद प्रभावी होंगे. " +#~ "सॉफ़्टवेयर अपडेट लागू करने के लिए पुनः प्रारंभ करें." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "आप %d सेकंड में लॉग आउट हो जाएंगे." +#~ msgstr[1] "आप %d सेकंड में लॉग आउट हो जाएंगे." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "कंप्यूटर %d सेकंड में पुनः प्रारंभ हो जाएगा." +#~ msgstr[1] "कंप्यूटर %d सेकंड में पुनः प्रारंभ हो जाएगा." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "कंप्यूटर %d सेकंड में बंद हो जाएगा." +#~ msgstr[1] "कंप्यूटर %d सेकंड में बंद हो जाएगा." diff --git a/po/hr.po b/po/hr.po new file mode 100644 index 0000000..f85663e --- /dev/null +++ b/po/hr.po @@ -0,0 +1,217 @@ +# Croatian translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Croatian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Potisni dijalog za potvrdu radnje odjave, ponovnog pokretanja i isključivanja" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Želite li ili ne želite prikaz dijaloga za potvrdu radnji odjave, ponovnog " +"pokretanja i isključivanja" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Odjava" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Ponovno pokretanje" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Isključi" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Odjava" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Ponovno pokretanje..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Isključi..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Ponovno pokretanje" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Isključi" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Ponovno pokretanje" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Isključi" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Ponovno pokretanje..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Isključi..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Ponovno pokretanje" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Ponovno pokretanje..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Promjena korisnika..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Promjena sa %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Stanje mirovanja" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Ponovno pokretanje" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Ponovno pokretanje..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Vaša nedavno instalirana ažuriranja koje će biti aktivna tek nakon " +#~ "ponovnog pokretanja. Ponovno pokrenite radi provedbe softverskih " +#~ "ažuriranja." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Za %d sekundi ćete biti odjavljeni." +#~ msgstr[1] "Za %d sekundi ćete biti odjavljeni." +#~ msgstr[2] "Za %d sekundi ćete biti odjavljeni." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Računalo će se ponovno pokrenuti za %d sekundu." +#~ msgstr[1] "Računalo će se ponovno pokrenuti za %d sekundi." +#~ msgstr[2] "Računalo će se ponovno pokrenuti za %d sekundi." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Računalo će se isključiti za %d sekundu." +#~ msgstr[1] "Računalo će se isključiti za %d sekundi." +#~ msgstr[2] "Računalo će se isključiti za %d sekundi." diff --git a/po/hu.po b/po/hu.po new file mode 100644 index 0000000..91a4dc8 --- /dev/null +++ b/po/hu.po @@ -0,0 +1,214 @@ +# Hungarian translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Hungarian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Kijelentkezés, újraindítás és leállítás megerősítő párbeszédpaneljének " +"letiltása" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Megjelenjen párbeszédpanel a kijelentkezés, újraindítás és leállítás " +"megerősítésére?" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Kijelentkezés" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Újraindítás" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Kikapcsolás" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Kijelentkezés" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Újraindítás..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Kikapcsolás..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Kijelentkezés" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Újraindítás" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Kikapcsolás" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Kijelentkezés" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Újraindítás" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Kikapcsolás" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Kijelentkezés" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Újraindítás..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Kikapcsolás..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Újraindítás" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Újraindítás..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Felhasználóváltás..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Átkapcsolás innen: %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Alvó állapot" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Újraindítás" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Újraindítás..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "A legutóbb telepített frissítések csak az újraindítás után lépnek " +#~ "érvénybe. A szoftverfrissítések érvénybe léptetéséhez indítsa újra a " +#~ "rendszert." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "%d másodperc múlva kijelentkezik." +#~ msgstr[1] "%d másodperc múlva kijelentkezik." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "A számítógép %d másodperc múlva újraindul." +#~ msgstr[1] "A számítógép %d másodperc múlva újraindul." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "A számítógép %d másodperc múlva kikapcsol." +#~ msgstr[1] "A számítógép %d másodperc múlva kikapcsol." diff --git a/po/it.po b/po/it.po new file mode 100644 index 0000000..60c2fd2 --- /dev/null +++ b/po/it.po @@ -0,0 +1,214 @@ +# Italian translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Italian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Non visualizzare finestra di dialogo di conferma per azioni di " +"disconnessione, riavvio e spegnimento" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Permette di specificare se visualizzare o meno le finestre di dialogo di " +"conferma per azioni di disconnessione, riavvio e spegnimento ." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Disconnetti" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Riavvia" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Spegni sistema" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Disconnetti" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Riavvia..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Spegni sistema..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Disconnetti" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Riavvia" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Spegni sistema" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Disconnetti" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Riavvia" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Spegni sistema" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Disconnetti" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Riavvia..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Spegni sistema..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Riavvia" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Riavvia..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Cambia utente..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Cambia da %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Sospendi" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Riavvia" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Riavvia..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Sono stati recentemente installati aggiornamenti che avranno effetto solo " +#~ "dopo un riavvio. Per applicare gli aggiornamenti software, riavviare il " +#~ "sistema." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Si verrà disconnessi tra %d secondo." +#~ msgstr[1] "Si verrà disconnessi tra %d secondi." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Il computer verrà riavviato tra %d secondo." +#~ msgstr[1] "Il computer verrà riavviato tra %d secondi." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Il computer verrà spento tra %d secondo." +#~ msgstr[1] "Il computer verrà spento tra %d secondi." diff --git a/po/ja.po b/po/ja.po new file mode 100644 index 0000000..a2ca479 --- /dev/null +++ b/po/ja.po @@ -0,0 +1,212 @@ +# Japanese translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Japanese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n!=1\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"ログアウト、再起動、およびシャットダウン操作を確認するダイアログを表示しない" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"ログアウト、再起動、およびシャットダウン操作の実行時に確認ダイアログを表示す" +"るかどうかを指定します。" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "ログアウト" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "再起動" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "シャットダウン" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "ログアウト" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "再起動..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "シャットダウン..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "ログアウト" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "再起動" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "シャットダウン" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "ログアウト" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "再起動" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "シャットダウン" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "ログアウト" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "再起動..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "シャットダウン..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "再起動" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "再起動..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "ユーザーの切り替え..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "%s から切り替え..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "スリープ" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "再起動" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "再起動..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "最近インストールしたアップデートは、再起動後に反映されます。再起動して、ソ" +#~ "フトウェア アップデートを適用します。" + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "%d 秒後にログアウトします。" +#~ msgstr[1] "%d 秒後にログアウトします。" + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "コンピュータは %d 秒後に再起動します。" +#~ msgstr[1] "コンピュータは %d 秒後に再起動します。" + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "コンピュータは %d 秒後にシャットダウンします。" +#~ msgstr[1] "コンピュータは %d 秒後にシャットダウンします。" diff --git a/po/ko.po b/po/ko.po new file mode 100644 index 0000000..117172e --- /dev/null +++ b/po/ko.po @@ -0,0 +1,209 @@ +# Korean translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Korean\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n!=1;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "로그아웃, 다시 시작 및 종료 동작을 확인하는 대화 상자 표시 안 함" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "로그아웃, 다시 시작 및 종료 동작을 확인하는 대화 상자를 표시할지 여부" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "로그 아웃" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "다시 시작" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "스위치 끄기" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "로그 아웃" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "다시 시작..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "스위치 끄기..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "로그 아웃" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "다시 시작" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "스위치 끄기" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "로그 아웃" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "다시 시작" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "스위치 끄기" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "로그 아웃" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "다시 시작..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "스위치 끄기..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "다시 시작" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "다시 시작..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "사용자 전환..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "%s에서 전환..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "절전" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "다시 시작" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "다시 시작..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "방금 설치한 업데이트는 다시 시작한 후에만 적용됩니다. 소프트웨어 업데이트" +#~ "를 적용하려면 다시 시작하십시오." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "%d초 후 로그 아웃됩니다." +#~ msgstr[1] "%d초 후 로그 아웃됩니다." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "컴퓨터가 %d초 후 다시 시작됩니다." +#~ msgstr[1] "컴퓨터가 %d초 후 다시 시작됩니다." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "컴퓨터가 %d초 후 스위치가 꺼집니다." +#~ msgstr[1] "컴퓨터가 %d초 후 스위치가 꺼집니다." diff --git a/po/nb.po b/po/nb.po new file mode 100644 index 0000000..b917fb3 --- /dev/null +++ b/po/nb.po @@ -0,0 +1,213 @@ +# Norwegian Bokmal translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Norwegian Bokmal\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Undertrykk dialogboksen for å bekrefte handlingene logg av, start på nytt og " +"slå av." + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Om bekreftelsesdialogbokser for handlingene logg av, start på nytt og slå " +"av, skal vises ." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Logg av" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Start på nytt" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Slå av" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Logg av" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Start på nytt..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Slå av..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Logg av" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Start på nytt" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Slå av" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Logg av" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Start på nytt" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Slå av" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Logg av" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Start på nytt..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Slå av..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Start på nytt" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Start på nytt..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Bytt bruker..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Bytt fra %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Hvilemodus" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Start på nytt" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Start på nytt..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Du installerte nylig oppdateringer som bare gjøres gjeldende etter en " +#~ "omstart. Start på nytt for å ta i bruk programvareoppdateringer." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Du blir logget av om %d sekund." +#~ msgstr[1] "Du blir logget av om %d sekunder." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Datamaskinen starter på nytt om %d sekund." +#~ msgstr[1] "Datamaskinen starter på nytt om %d sekunder." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Datamaskinen slås av om %d sekund." +#~ msgstr[1] "Datamaskinen slås av om %d sekunder." diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 0000000..7056702 --- /dev/null +++ b/po/nl.po @@ -0,0 +1,214 @@ +# Dutch translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Dutch\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Weergave van bevestigingsvenster voor afmelden, opnieuw opstarten en " +"uitschakelen" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Geef aan of u de bevestigingsvensters voor afmelden, opnieuw opstarten en " +"uitschakelen wilt weergeven." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Afmelden" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Opnieuw opstarten" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Uitschakelen" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Afmelden" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Opnieuw opstarten..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Uitschakelen..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Afmelden" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Opnieuw opstarten" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Uitschakelen" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Afmelden" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Opnieuw opstarten" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Uitschakelen" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Afmelden" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Opnieuw opstarten..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Uitschakelen..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Opnieuw opstarten" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Opnieuw opstarten..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Andere gebruiker..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Overschakelen van %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Slaapstand" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Opnieuw opstarten" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Opnieuw opstarten..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "U hebt onlangs updates geïnstalleerd die pas worden toegepast nadat u " +#~ "opnieuw bent opgestart. Opnieuw opstarten om software-updates toe te " +#~ "passen." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "U wordt afgemeld over %d seconde." +#~ msgstr[1] "U wordt afgemeld over %d seconden." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "De computer wordt opnieuw opgestart over %d seconde." +#~ msgstr[1] "De computer wordt opnieuw opgestart over %d seconden." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "De computer wordt uitgeschakeld over %d seconde." +#~ msgstr[1] "De computer wordt uitgeschakeld over %d seconden." diff --git a/po/pl.po b/po/pl.po new file mode 100644 index 0000000..46b3e91 --- /dev/null +++ b/po/pl.po @@ -0,0 +1,218 @@ +# Polish translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Polish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Wstrzymaj okno dialogowe, aby potwierdzić czynności wylogowania się, " +"ponownego uruchomienia i zamknięcia" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Wyświetlanie okien dialogowych potwierdzenia czynności wylogowania się, " +"ponownego uruchomienia i zamknięcia ." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Wyloguj się" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Uruchom ponownie" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Wyłącz" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Wyloguj się" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Uruchom ponownie..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Wyłącz..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Wyloguj się" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Uruchom ponownie" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Wyłącz" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Wyloguj się" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Uruchom ponownie" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Wyłącz" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Wyloguj się" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Uruchom ponownie..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Wyłącz..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Uruchom ponownie" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Uruchom ponownie..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Przełącz użytkownika..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Przełącz z: %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Tryb uśpienia" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Uruchom ponownie" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Uruchom ponownie..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Ostatnio zainstalowane aktualizacje będą zastosowane po ponownym " +#~ "uruchomieniu. Uruchom ponownie, aby zastosować aktualizacje " +#~ "oprogramowania." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Użytkownik zostanie wylogowany po %d s." +#~ msgstr[1] "Użytkownik zostanie wylogowany po %d s." +#~ msgstr[2] "Użytkownik zostanie wylogowany po %d s." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Komputer zostanie ponownie uruchomiony po %d s." +#~ msgstr[1] "Komputer zostanie ponownie uruchomiony po %d s." +#~ msgstr[2] "Komputer zostanie ponownie uruchomiony po %d s." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Komputer zostanie wyłączony po %d s." +#~ msgstr[1] "Komputer zostanie wyłączony po %d s." +#~ msgstr[2] "Komputer zostanie wyłączony po %d s." diff --git a/po/pt.po b/po/pt.po new file mode 100644 index 0000000..dd94588 --- /dev/null +++ b/po/pt.po @@ -0,0 +1,213 @@ +# Portuguese translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Portuguese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Suprimir a caixa de diálogo para confirmar acções de terminar sessão, " +"reinicializar e encerrar" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Mostrar ou não a caixa de diálogo para confirmar acções de terminar sessão, " +"reinicializar e encerrar ." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Terminar sessão" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Reiniciar" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Desligar" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Terminar sessão" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Reiniciar..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Desligar" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Terminar sessão" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Reiniciar" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Desligar" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Terminar sessão" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Reiniciar" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Desligar" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Terminar sessão" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Reiniciar..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Desligar" + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Reiniciar" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Reiniciar..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Mudar de utilizador..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Mudar de %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Suspensão" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Reiniciar" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Reiniciar..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Instalou recentemente actualizações que só terão efeito depois de " +#~ "reiniciar. Reiniciar para aplicar actualizações de software." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "A sua sessão será encerrada dentro de %d segundos." +#~ msgstr[1] "A sua sessão será encerrada dentro de %d segundos." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "O computador irá reiniciar dentro de %d segundos." +#~ msgstr[1] "O computador irá reiniciar dentro de %d segundos." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "O computador irá desligar dentro de %d segundos." +#~ msgstr[1] "O computador irá desligar dentro de %d segundos." diff --git a/po/pt_BR.po b/po/pt_BR.po new file mode 100644 index 0000000..fa85be1 --- /dev/null +++ b/po/pt_BR.po @@ -0,0 +1,213 @@ +# Portuguese translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Brazilian Portuguese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Suprimir a caixa de diálogo para confirmar ação de logoff, reinicialização e " +"desligamento" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Mostrar ou não caixas de confirmação para ações de logoff, reinicialização e " +"desligamento ." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Desconectar" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Reiniciar" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Desligar" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Desconectar" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Reiniciar..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Desligar..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Desconectar" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Reiniciar" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Desligar" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Desconectar" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Reiniciar" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Desligar" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Desconectar" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Reiniciar..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Desligar..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Reiniciar" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Reiniciar..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Trocar usuário..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Trocar de %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Hibernar" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Reiniciar" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Reiniciar..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Recentemente você instalou atualizações que serão efetivadas somente após " +#~ "uma reinicialização. Reinicie para aplicar as atualizações do software." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Você será desconectado em %d segundo." +#~ msgstr[1] "Você será desconectado em %d segundos." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "O computador será reiniciado em %d segundo." +#~ msgstr[1] "O computador será reiniciado em %d segundos." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "O computador será desligado em %d segundo." +#~ msgstr[1] "O computador será desligado em %d segundos." diff --git a/po/ro.po b/po/ro.po new file mode 100644 index 0000000..9664ba4 --- /dev/null +++ b/po/ro.po @@ -0,0 +1,217 @@ +# Romanian translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Romanian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Interzice dialogul pentru confirmarea acțiunii de deconectare, repornire și " +"oprire." + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Arată sau nu dialogurile de confirmare pentru acțiunile de deconectare, " +"repornire și oprire." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Deconectare" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Repornire" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Închidere" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Deconectare" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Repornire..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Închidere..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Deconectare" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Repornire" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Închidere" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Deconectare" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Repornire" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Închidere" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Deconectare" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Repornire..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Închidere..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Repornire" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Repornire..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Schimbare utilizator..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Schimbare de la %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Inactivitate" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Repornire" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Repornire..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Ați instalat recent actualizări care vor avea efect numai după o " +#~ "repornire. Repornire pentru a activa actualizările software. " + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Veți fi deconectat în %d secundă." +#~ msgstr[1] "Veți fi deconectat în %d secunde." +#~ msgstr[2] "Veți fi deconectat în %d secunde." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Calculatorul va reporni în %d secundă." +#~ msgstr[1] "Calculatorul va reporni în %d secunde." +#~ msgstr[2] "Calculatorul va reporni în %d secunde." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Calculatorul se va închide în %d secundă." +#~ msgstr[1] "Calculatorul se va închide în %d secunde." +#~ msgstr[2] "Calculatorul se va închide în %d secunde." diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 0000000..caadccc --- /dev/null +++ b/po/ru.po @@ -0,0 +1,217 @@ +# Russian translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Russian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Не выводить диалог подтверждения выхода, перезапуска и завершения работы" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Показывать или нет диалоги подтверждения выхода из системы, перезапуска и " +"завершения работы" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Выход из системы" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Перезапуск" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Выключение" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Выход из системы" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Перезапуск..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Выключение..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Выход из системы" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Перезапуск" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Выключение" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Выход из системы" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Перезапуск" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Выключение" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Выход из системы" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Перезапуск..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Выключение..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Перезапуск" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Перезапуск..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Смена пользователя..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Смена %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Сон" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Перезапуск" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Перезапуск..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Недавно вы установили обновления, которые вступят в силу только после " +#~ "перезапуска. Выполните перезапуск, чтобы ввести программные обновления в " +#~ "действие." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Вы выйдите из системы через %d секунду." +#~ msgstr[1] "Вы выйдите из системы через %d секунды." +#~ msgstr[2] "Вы выйдите из системы через %d секунд." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Компьютер будет перезапущен через %d секунду." +#~ msgstr[1] "Компьютер будет перезапущен через %d секунды." +#~ msgstr[2] "Компьютер будет перезапущен через %d секунд." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Компьютер будет выключен через %d секунду." +#~ msgstr[1] "Компьютер будет выключен через %d секунды." +#~ msgstr[2] "Компьютер будет выключен через %d секунд." diff --git a/po/sk.po b/po/sk.po new file mode 100644 index 0000000..1244d6c --- /dev/null +++ b/po/sk.po @@ -0,0 +1,215 @@ +# Slovak translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Slovak\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Zakázať dialógové okno pre potvrdenie odhlásenia, reštartovania a vypnutia" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Zobraziť alebo nezobraziť potvrdzujúce dialógové okno pri odhlásení, " +"reštartovaní a vypínaní." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Odhlásiť sa" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Reštartovať" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Vypnúť" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Odhlásiť sa" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Reštartovať..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Vypnúť..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Odhlásiť sa" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Reštartovať" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Vypnúť" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Odhlásiť sa" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Reštartovať" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Vypnúť" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Odhlásiť sa" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Reštartovať..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Vypnúť..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Reštartovať" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Reštartovať..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Prepnúť používateľa..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Prepnúť z %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Spánok" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Reštartovať" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Reštartovať..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Nedávno ste nainštalovali aktualizácie, ktoré sa prejavia až po " +#~ "reštartovaní. Reštartovať a použiť aktualizácie softvéru." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Budete odhlásený o %d sekundu." +#~ msgstr[1] "Budete odhlásený o %d sekundy." +#~ msgstr[2] "Budete odhlásený o %d sekúnd." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Počítač bude reštartovaný o%d sekundu." +#~ msgstr[1] "Počítač bude reštartovaný o %d sekundy." +#~ msgstr[2] "Počítač bude reštartovaný o %d sekúnd." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Počítač bude vypnutý o %d sekundu." +#~ msgstr[1] "Počítač bude reštartovaný o %d sekundy." +#~ msgstr[2] "Počítač bude reštartovaný o %d sekúnd." diff --git a/po/sl.po b/po/sl.po new file mode 100644 index 0000000..12330f1 --- /dev/null +++ b/po/sl.po @@ -0,0 +1,221 @@ +# Slovenian translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Slovenian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Ne prikazuj pogovornih oken za potrditev odjave, vnovičnega zagona in " +"zaustavitve sistema" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Vklop in izklop prikaza potrditvenih pogovornih oken za odjavo, vnovični " +"zagon in zaustavitev sistema." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Odjava" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Vnovični zagon" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Izklop" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Odjava" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Vnovični zagon ..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Izklop ..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Vnovični zagon" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Izklop" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Vnovični zagon" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Izklop" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Vnovični zagon ..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Izklop ..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Vnovični zagon" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Vnovični zagon ..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Preklop uporabnika ..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Preklop iz %s ..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Mirovanje" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Vnovični zagon" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Vnovični zagon ..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Namestili ste posodobitve, ki bodo začele veljati šele po vnovičnem " +#~ "zagonu. Sistem zaženite znova, da bodo posodobitve programske opreme " +#~ "začele veljati." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Odjavljeni boste čez %d sekundo." +#~ msgstr[1] "Odjavljeni boste čez %d sekundi." +#~ msgstr[2] "Odjavljeni boste čez %d sekunde." +#~ msgstr[3] "Odjavljeni boste čez %d sekund." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Računalnik se bo znova zagnal čez %d sekundo." +#~ msgstr[1] "Računalnik se bo znova zagnal čez %d sekundi." +#~ msgstr[2] "Računalnik se bo znova zagnal čez %d sekunde." +#~ msgstr[3] "Računalnik se bo znova zagnal čez %d sekund." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Računalnik se bo izključil čez %d sekundo." +#~ msgstr[1] "Računalnik se bo izključil čez %d sekundi." +#~ msgstr[2] "Računalnik se bo izključil čez %d sekunde." +#~ msgstr[3] "Računalnik se bo izključil čez %d sekund." diff --git a/po/sr.po b/po/sr.po new file mode 100644 index 0000000..9b2c008 --- /dev/null +++ b/po/sr.po @@ -0,0 +1,218 @@ +# Serbian translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Serbian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Spreči dijalog da biste potvrdili odjavu, ponovo pokrenite i isključite " +"radnju" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Bilo da želite ili ne da prikažite potvrdni dijalog za odjavu, ponovno " +"pokretanje i isključivanje radnji." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Odjava" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Ponovo pokreni" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Isključi" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Odjava" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Ponovno pokretanje u toku..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Isključivanje u toku..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Ponovo pokreni" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Isključi" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Ponovo pokreni" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Isključi" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Odjava" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Ponovno pokretanje u toku..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Isključivanje u toku..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Ponovo pokreni" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Ponovno pokretanje u toku..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Promena korisnika u toku..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Promeni od %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Stanje spavanja" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Ponovo pokreni" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Ponovno pokretanje u toku..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Nedavno ste instalirali ispravke koje će postati aktivne tek nakon " +#~ "ponovnog pokretanja računara. Ponovo pokrenite računar da biste " +#~ "primenili ispravke softvera." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Bićete odjavljeni za %d sekundu." +#~ msgstr[1] "Bićete odjavljeni za %d sekundi." +#~ msgstr[2] "Bićete odjavljeni za %d sekundi." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Računar će se ponovo pokrenuti za %d sekundi." +#~ msgstr[1] "Računar će se ponovo pokrenuti za %d sekundi." +#~ msgstr[2] "Računar će se ponovo pokrenuti za %d sekundi." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Računar će se isključiti za %d sekundu." +#~ msgstr[1] "Računar će se isključiti za %d sekundi." +#~ msgstr[2] "Računar će se isključiti za %d sekundi." diff --git a/po/sv.po b/po/sv.po new file mode 100644 index 0000000..adf83f9 --- /dev/null +++ b/po/sv.po @@ -0,0 +1,212 @@ +# Swedish translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Swedish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Visa inte dialogrutan för att bekräfta utloggning, omstart och avstängning" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Bestäm om dialogruta för att bekräfta utloggning, omstart och avstängning " +"ska visas ." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Logga ut" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Starta om" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Stäng av" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Logga ut" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Starta om..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Stäng av..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Logga ut" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Starta om" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Stäng av" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Logga ut" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Starta om" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Stäng av" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Logga ut" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Starta om..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Stäng av..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Starta om" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Starta om..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Växla användare..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Växla från %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Vila" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Starta om" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Starta om..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Du har installerat uppdateringar som kommer att gälla först sedan du " +#~ "startat om. Starta om för att tillämpa programuppdateringar." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "Du kommer att loggas ut om %d sekund." +#~ msgstr[1] "Du kommer att loggas ut om %d sekunder." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Datorn startas om om %d sekund." +#~ msgstr[1] "Datorn startas om om %d sekunder." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Datorn stängs av om %d sekund." +#~ msgstr[1] "Datorn stängs av om %d sekunder." diff --git a/po/th.po b/po/th.po new file mode 100644 index 0000000..9422fa5 --- /dev/null +++ b/po/th.po @@ -0,0 +1,209 @@ +# Thai translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Thai\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"ยกเลิกไดอะล็อกเพื่อยืนยันการดำเนินการออกจากระบบ เริ่มต้นการทำงานใหม่ และปิดการทำงาน" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"เลือกว่าจะแสดงไดอะล็อกการยืนยันเพื่อออกจากระบบ เริ่มต้นการทำงานใหม่ และปิดการทำงานหรือไม่ " +"การดำเนินการ" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "ออกจากระบบ" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "เริ่มต้นการทำงานใหม่" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "ปิดเครื่อง" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "ออกจากระบบ" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "เริ่มต้นการทำงานใหม่..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "ปิดเครื่อง..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "ออกจากระบบ" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "เริ่มต้นการทำงานใหม่" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "ปิดเครื่อง" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "ออกจากระบบ" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "เริ่มต้นการทำงานใหม่" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "ปิดเครื่อง" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "ออกจากระบบ" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "เริ่มต้นการทำงานใหม่..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "ปิดเครื่อง..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "เริ่มต้นการทำงานใหม่" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "เริ่มต้นการทำงานใหม่..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "สลับผู้ใช้..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "สลับจาก %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "พัก" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "เริ่มต้นการทำงานใหม่" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "เริ่มต้นการทำงานใหม่..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "คุณติดตั้งการอัพเดตไปเมื่อเร็วๆ นี้ ซึ่งจะมีผลใช้งานหลังจากเริ่มต้นการทำงานใหม่ " +#~ "เริ่มต้นการทำงานใหม่เพื่อนำการอัพเดตซอฟต์แวร์ไปใช้" + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "คุณจะถูกนำออกจากระบบใน %d วินาที" + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "คอมพิวเตอร์จะเริ่มต้นการทำงานใหม่ใน %d วินาที" + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "คอมพิวเตอร์จะปิดเครื่องใน %d วินาที" diff --git a/po/tr.po b/po/tr.po new file mode 100644 index 0000000..c30b2b5 --- /dev/null +++ b/po/tr.po @@ -0,0 +1,211 @@ +# Turkish translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Turkish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "" +"Çıkış, yeniden başlatma ve kapatma eylemini onaylamak için iletişim kutusunu " +"kapat" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "" +"Çıkış, yeniden başlatma ve kapatma eylemleri için onay iletişim kutusu " +"gösterin veya göstermeyin." + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "Çık" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "Yeniden Başlat" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "Kapat" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "Çık" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "Yeniden Başlat..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "Kapat..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "Çık" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "Yeniden Başlat" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "Kapat" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "Çık" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "Yeniden Başlat" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "Kapat" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "Çık" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "Yeniden Başlat..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "Kapat..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "Yeniden Başlat" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "Yeniden Başlat..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "Kullanıcı Değiştir..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "Geçiş yapılan %s..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "Uyku" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "Yeniden Başlat" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "Yeniden Başlat..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "Ancak sistem yeniden başlatıldıktan sonra geçerli olabilecek " +#~ "güncelleştirmeler yüklediniz. Yazılım güncelleştirmelerini uygulamak " +#~ "için yeniden başlatın." + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "%d sâniye içinde çıkarılacaksınız." + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "Bilgisayar %d sâniye içinde yeniden başlatılacak." + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "Bilgisayar %d sâniye içinde kapatılacak." diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 index 0000000..85f1204 --- /dev/null +++ b/po/zh_CN.po @@ -0,0 +1,209 @@ +# Chinese translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Chinese (simplified)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "禁止确认注销、重新启动和关机操作的对话出现" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "是否显示确认注销、重新启动和关机操作的对话。" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "注销" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "重新启动" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "关闭" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "注销" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "重新启动..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "关闭..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "注销" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "重新启动" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "关闭" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "注销" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "重新启动" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "关闭" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "注销" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "重新启动..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "关闭..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "重新启动" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "重新启动..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "切换用户..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "从 %s 切换..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "休眠" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "重新启动" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "重新启动..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "您最近安装了更新，这些更新只有在重新启动后才能生效。 重新启动以应用软件更" +#~ "新。" + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "您将在 %d 秒内注销。" +#~ msgstr[1] "您将在 %d 秒内注销。" + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "计算机将在 %d 秒内重新启动。" +#~ msgstr[1] "计算机将在 %d 秒内重新启动。" + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "计算机将在 %d 秒内关闭。" +#~ msgstr[1] "计算机将在 %d 秒内关闭。" diff --git a/po/zh_TW.po b/po/zh_TW.po new file mode 100644 index 0000000..a894b83 --- /dev/null +++ b/po/zh_TW.po @@ -0,0 +1,209 @@ +# Chinese translations for PACKAGE package. +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Canonical OEM, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-session\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 17:38-0500\n" +"PO-Revision-Date: 2010-03-03 10:21-0500\n" +"Last-Translator: Canonical OEM\n" +"Language-Team: Chinese (traditional)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: ../data/indicator-session.schemas.in.h:1 +msgid "Suppress the dialog to confirm logout, restart and shutdown action" +msgstr "停用確認登出、重新啟動和關機操作的對話出現" + +#: ../data/indicator-session.schemas.in.h:2 +msgid "" +"Whether or not to show confirmation dialogs for logout, restart and shutdown " +"actions." +msgstr "是否顯示確認登出、重新啟動和關機操作的對話。" + +#: ../src/gconf-helper.c:52 ../src/session-service.c:538 +#, fuzzy +msgid "Log Out" +msgstr "登出" + +#: ../src/gconf-helper.c:53 ../src/session-service.c:559 +#: ../src/session-service.c:625 +#, fuzzy +msgid "Restart" +msgstr "重新啟動" + +#: ../src/gconf-helper.c:54 ../src/session-service.c:568 +msgid "Switch Off" +msgstr "關閉" + +#: ../src/gconf-helper.c:56 ../src/session-service.c:540 +#, fuzzy +msgid "Log Out..." +msgstr "登出" + +#: ../src/gconf-helper.c:57 ../src/session-service.c:561 +#: ../src/session-service.c:627 +msgid "Restart..." +msgstr "重新啟動..." + +#: ../src/gconf-helper.c:58 ../src/session-service.c:570 +msgid "Switch Off..." +msgstr "關閉..." + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:35 +msgctxt "title" +msgid "Log Out" +msgstr "登出" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:36 +msgctxt "title" +msgid "Restart" +msgstr "重新啟動" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:37 +msgctxt "title" +msgid "Switch Off" +msgstr "關閉" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:41 +msgid "" +"Are you sure you want to close all programs and log out of the computer?" +msgstr "" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:42 +msgid "Are you sure you want to close all programs and restart the computer?" +msgstr "" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:43 +msgid "Are you sure you want to close all programs and shut down the computer?" +msgstr "" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:47 +msgctxt "button" +msgid "Log Out" +msgstr "登出" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:48 +msgctxt "button" +msgid "Restart" +msgstr "重新啟動" + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:49 +msgctxt "button" +msgid "Switch Off" +msgstr "關閉" + +#. LOGOUT_DIALOG_LOGOUT, +#: ../src/dialog.c:55 +#, fuzzy +msgctxt "button auth" +msgid "Log Out" +msgstr "登出" + +#. LOGOUT_DIALOG_RESTART, +#: ../src/dialog.c:56 +#, fuzzy +msgctxt "button auth" +msgid "Restart..." +msgstr "重新啟動..." + +#. LOGOUT_DIALOG_SHUTDOWN, +#: ../src/dialog.c:57 +#, fuzzy +msgctxt "button auth" +msgid "Switch Off..." +msgstr "關閉..." + +#. TRANSLATORS: This button appears on the logout dialog when +#. there are updates that require restart. It will do a restart +#. in place of a log out. +#: ../src/dialog.c:63 +#, fuzzy +msgid "Restart Instead" +msgstr "重新啟動" + +#: ../src/dialog.c:64 +#, fuzzy +msgid "Restart Instead..." +msgstr "重新啟動..." + +#: ../src/dialog.c:65 +msgid "Some software updates won't apply until the computer next restarts." +msgstr "" + +#: ../src/dialog.c:217 ../src/dialog.c:222 +msgid "Cancel" +msgstr "" + +#: ../src/indicator-session.c:203 +msgid "Switch User..." +msgstr "切換使用者..." + +#. TODO: We need some way to remove the elipsis from appearing +#. twice in the label. Not sure how to do that yet. +#: ../src/indicator-session.c:232 +#, c-format +msgid "Switch from %s..." +msgstr "從 %s 切換..." + +#: ../src/session-service.c:437 +msgid "Lock Screen" +msgstr "" + +#: ../src/session-service.c:456 +msgid "Guest Session" +msgstr "" + +#: ../src/session-service.c:547 +msgid "Sleep" +msgstr "休眠" + +#: ../src/session-service.c:553 +msgid "Hibernate" +msgstr "" + +#: ../src/session-service.c:618 +#, fuzzy +msgid "Restart Required" +msgstr "重新啟動" + +#: ../src/session-service.c:620 +#, fuzzy +msgid "Restart Required..." +msgstr "重新啟動..." + +#~ msgid "" +#~ "You recently installed updates which will only take effect after a " +#~ "restart. Restart to apply software updates." +#~ msgstr "" +#~ "您最近安裝了更新，這些更新只有在重新啟動後才能生效。 重新啟動以應用軟體更" +#~ "新。" + +#~ msgid "You will be logged out in %d second." +#~ msgid_plural "You will be logged out in %d seconds." +#~ msgstr[0] "您將在 %d 秒內登出。" +#~ msgstr[1] "您將在 %d 秒內登出。" + +#~ msgid "The computer will restart in %d second." +#~ msgid_plural "The computer will restart in %d seconds." +#~ msgstr[0] "電腦將在 %d 秒內重新啟動。" +#~ msgstr[1] "電腦將在 %d 秒內重新啟動。" + +#~ msgid "The computer will switch off in %d second." +#~ msgid_plural "The computer will switch off in %d seconds." +#~ msgstr[0] "電腦將在 %d 秒內關閉。" +#~ msgstr[1] "電腦將在 %d 秒內關閉。" -- cgit v1.2.3 From dc5302fcdcfb8eb5c54092107c49e3cc3a9deeea Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Wed, 10 Mar 2010 17:33:32 -0600 Subject: Use gint64, not UserData*, for the callback to user-added signal. --- src/session-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index a6c3fc3..febf007 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -586,7 +586,7 @@ rebuild_items (DbusmenuMenuitem *root, rebuilds the menu */ static void user_change (UsersServiceDbus *service, - UserData *user, + gint64 user, gpointer user_data) { DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data; -- cgit v1.2.3 From a4eb496c3b8f5455357ef2760e003e04d781f885 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 20:56:35 -0600 Subject: A bunch of properties to make our new menu item type. --- src/dbus-shared-names.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 253cba8..9d39ab3 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -42,4 +42,8 @@ with this program. If not, see . #define USER_ITEM_PROP_NAME "user-item-name" #define USER_ITEM_PROP_LOGGED_IN "user-item-logged-in" +#define RESTART_ITEM_TYPE "x-canonical-restart-item" +#define RESTART_ITEM_LABEL "restart-label" +#define RESTART_ITEM_ICON "restart-icon" + #endif /* __DBUS_SHARED_NAMES_H__ */ -- cgit v1.2.3 From fb8754f048176039d268157a22da3745773bd15b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 12:25:58 -0600 Subject: Adding in a handler and renderer for the restart required item --- src/indicator-session.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index a815e40..fab3463 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -69,6 +69,7 @@ static GtkImage * get_icon (IndicatorObject * io); static GtkMenu * get_menu (IndicatorObject * io); static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); +static gboolean build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); static void indicator_session_class_init (IndicatorSessionClass *klass); static void indicator_session_init (IndicatorSession *self); @@ -108,6 +109,7 @@ indicator_session_init (IndicatorSession *self) DbusmenuClient * client = DBUSMENU_CLIENT(dbusmenu_gtkmenu_get_client(self->menu)); dbusmenu_client_add_type_handler(client, MENU_SWITCH_TYPE, build_menu_switch); dbusmenu_client_add_type_handler(client, USER_ITEM_TYPE, new_user_item); + dbusmenu_client_add_type_handler(client, RESTART_ITEM_TYPE, build_restart_item); return; } @@ -253,6 +255,60 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G static const gchar * dbusmenu_item_data = "dbusmenu-item"; +/* IF the label or icon changes we need to grab that and update + the menu item */ +static void +restart_property_change (DbusmenuMenuitem * item, const gchar * property, const GValue * value, gpointer user_data) +{ + DbusmenuGtkClient * client = DBUSMENU_GTKCLIENT(user_data); + GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(client, item); + + if (g_strcmp0(property, RESTART_ITEM_LABEL) == 0) { + gtk_menu_item_set_label(gmi, g_value_get_string(value)); + } else if (g_strcmp0(property, RESTART_ITEM_ICON) == 0) { + GtkWidget * image = gtk_image_menu_item_get_image(GTK_IMAGE_MENU_ITEM(gmi)); + + if (image == NULL) { + image = gtk_image_new_from_icon_name(g_value_get_string(value), GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gmi), image); + } else { + gtk_image_set_from_icon_name(GTK_IMAGE(image), g_value_get_string(value), GTK_ICON_SIZE_MENU); + } + } + + return; +} + +/* Builds the restart item which is a more traditional GTK image + menu item that puts the graphic into the gutter. */ +static gboolean +build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +{ + GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new()); + if (gmi == NULL) { + return FALSE; + } + + dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); + + g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(restart_property_change), client); + + /* Grab the inital values and put them into the item */ + const GValue * value; + value = dbusmenu_menuitem_property_get_value(newitem, RESTART_ITEM_LABEL); + if (value != NULL) { + restart_property_change(newitem, RESTART_ITEM_LABEL, value, client); + } + + value = dbusmenu_menuitem_property_get_value(newitem, RESTART_ITEM_ICON); + if (value != NULL) { + restart_property_change(newitem, RESTART_ITEM_ICON, value, client); + } + + return TRUE; +} + + /* Callback for when the style changes so we can reevaluate the size of the user name with the potentially new font. */ static void @@ -265,7 +321,6 @@ switch_style_set (GtkWidget * widget, GtkStyle * prev_style, gpointer user_data) return; } - /* This function checks to see if the user name is short enough to not need ellipsing itself, or if, it will get ellipsed by the standard label processor. */ -- cgit v1.2.3 From 9bfcbd2b420b19a43d1704c6562d4709ebb570f6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 12:39:47 -0600 Subject: Changing the service to use the new menu item --- src/gconf-helper.c | 5 +++-- src/session-service.c | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/gconf-helper.c b/src/gconf-helper.c index 9262b19..5efc439 100644 --- a/src/gconf-helper.c +++ b/src/gconf-helper.c @@ -30,6 +30,7 @@ with this program. If not, see . #include #include +#include "dbus-shared-names.h" #include "gconf-helper.h" static GConfClient * gconf_client = NULL; @@ -50,11 +51,11 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC if(g_strcmp0 (key, SUPPRESS_KEY) == 0) { 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->restart_mi, RESTART_ITEM_LABEL, _("Restart")); 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->restart_mi, RESTART_ITEM_LABEL, _("Restart...")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off...")); } } diff --git a/src/session-service.c b/src/session-service.c index febf007..51a930a 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -555,10 +555,11 @@ rebuild_items (DbusmenuMenuitem *root, g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Hibernate"); restart_mi = dbusmenu_menuitem_new(); + dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_TYPE, RESTART_ITEM_TYPE); if (supress_confirmations()) { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); } else { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); } dbusmenu_menuitem_child_append(root, restart_mi); g_signal_connect(G_OBJECT(restart_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "restart"); @@ -615,18 +616,18 @@ restart_dir_changed (void) if (restart_required) { if (supress_confirmations()) { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required")); } else { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required...")); } - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important"); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "emblem-important"); } else { if (supress_confirmations()) { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); } else { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); } - dbusmenu_menuitem_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME); + dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON); } return; -- cgit v1.2.3 From 535a2e63fd4e605ef63c933797abedcc28a55861 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 13:04:22 -0600 Subject: Setting up the indicator to use library translations so they'll be grabbed from the right domain. --- src/indicator-session.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index a815e40..54431ee 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -20,9 +20,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include -#include +#include #include #include -- cgit v1.2.3 From eed04dff5181b860c8c86281e94018f8228ddc72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 13:43:37 -0600 Subject: Simple starter object for making the dbus interface. --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index cd525bd..d8d8acd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,6 +50,8 @@ indicator_session_service_SOURCES = \ lock-helper.c \ lock-helper.h \ session-service.c \ + session-dbus.c \ + session-dbus.h \ dbusmenu-shared.h \ gconf-helper.c \ users-service-dbus.h \ -- cgit v1.2.3 From 931ee90269a965820091d1397e4f5ebf123720a7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 13:58:39 -0600 Subject: Adding in base objects --- src/session-dbus.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/session-dbus.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 src/session-dbus.c create mode 100644 src/session-dbus.h diff --git a/src/session-dbus.c b/src/session-dbus.c new file mode 100644 index 0000000..2b7443e --- /dev/null +++ b/src/session-dbus.c @@ -0,0 +1,54 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "session-dbus.h" + +typedef struct _SessionDbusPrivate SessionDbusPrivate; +struct _SessionDbusPrivate { + gint dummy; +}; + +#define SESSION_DBUS_GET_PRIVATE(o) \ +(G_TYPE_INSTANCE_GET_PRIVATE ((o), SESSION_DBUS_TYPE, SessionDbusPrivate)) + +static void session_dbus_class_init (SessionDbusClass *klass); +static void session_dbus_init (SessionDbus *self); +static void session_dbus_dispose (GObject *object); +static void session_dbus_finalize (GObject *object); + +G_DEFINE_TYPE (SessionDbus, session_dbus, G_TYPE_OBJECT); + +static void +session_dbus_class_init (SessionDbusClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (SessionDbusPrivate)); + + object_class->dispose = session_dbus_dispose; + object_class->finalize = session_dbus_finalize; + + return; +} + +static void +session_dbus_init (SessionDbus *self) +{ +} + +static void +session_dbus_dispose (GObject *object) +{ + + G_OBJECT_CLASS (session_dbus_parent_class)->dispose (object); + return; +} + +static void +session_dbus_finalize (GObject *object) +{ + + G_OBJECT_CLASS (session_dbus_parent_class)->finalize (object); + return; +} diff --git a/src/session-dbus.h b/src/session-dbus.h new file mode 100644 index 0000000..be57df7 --- /dev/null +++ b/src/session-dbus.h @@ -0,0 +1,31 @@ +#ifndef __SESSION_DBUS_H__ +#define __SESSION_DBUS_H__ + +#include +#include + +G_BEGIN_DECLS + +#define SESSION_DBUS_TYPE (session_dbus_get_type ()) +#define SESSION_DBUS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SESSION_DBUS_TYPE, SessionDbus)) +#define SESSION_DBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SESSION_DBUS_TYPE, SessionDbusClass)) +#define IS_SESSION_DBUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SESSION_DBUS_TYPE)) +#define IS_SESSION_DBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SESSION_DBUS_TYPE)) +#define SESSION_DBUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SESSION_DBUS_TYPE, SessionDbusClass)) + +typedef struct _SessionDbus SessionDbus; +typedef struct _SessionDbusClass SessionDbusClass; + +struct _SessionDbusClass { + GObjectClass parent_class; +}; + +struct _SessionDbus { + GObject parent; +}; + +GType session_dbus_get_type (void); + +G_END_DECLS + +#endif -- cgit v1.2.3 From 64c34204592848587c9b965c339d75305b35eebe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 14:00:20 -0600 Subject: Setting up session dbus interface client server stuff. --- .bzrignore | 2 ++ src/Makefile.am | 19 +++++++++++++++++++ src/session-dbus.xml | 15 +++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 src/session-dbus.xml diff --git a/.bzrignore b/.bzrignore index c993ea1..bf3135e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -55,3 +55,5 @@ indicator-session-[0-9].[0-9].tar.gz indicator-session-[0-9].[0-9].[0-9].tar.gz.asc indicator-session-[0-9].[0-9].tar.gz.asc src/consolekit-manager-client.h +src/session-dbus-client.h +src/session-dbus-server.h diff --git a/src/Makefile.am b/src/Makefile.am index d8d8acd..3037a3b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,7 @@ sessionlibdir = $(INDICATORDIR) sessionlib_LTLIBRARIES = libsession.la libsession_la_SOURCES = \ indicator-session.c \ + session-dbus-client.h \ dbus-shared-names.h \ dbusmenu-shared.h \ users-service-client.h @@ -32,6 +33,20 @@ users-service-client.h: $(srcdir)/users-service.xml --output=users-service-client.h \ $(srcdir)/users-service.xml +session-dbus-client.h: $(srcdir)/session-dbus.xml + dbus-binding-tool \ + --prefix=_session_dbus_client \ + --mode=glib-client \ + --output=session-dbus-client.h \ + $(srcdir)/session-dbus.xml + +session-dbus-server.h: $(srcdir)/session-dbus.xml + dbus-binding-tool \ + --prefix=_session_dbus_server \ + --mode=glib-server \ + --output=session-dbus-server.h \ + $(srcdir)/session-dbus.xml + users-service-marshal.h: $(srcdir)/users-service.list glib-genmarshal --header \ --prefix=_users_service_marshal $(srcdir)/users-service.list \ @@ -52,6 +67,7 @@ indicator_session_service_SOURCES = \ session-service.c \ session-dbus.c \ session-dbus.h \ + session-dbus-server.h \ dbusmenu-shared.h \ gconf-helper.c \ users-service-dbus.h \ @@ -90,12 +106,15 @@ gtk_logout_helper_LDADD = \ BUILT_SOURCES = \ consolekit-manager-client.h \ + session-dbus-client.h \ + session-dbus-server.h \ users-service-client.h \ users-service-marshal.h \ users-service-marshal.c EXTRA_DIST = \ consolekit-manager.xml \ + session-dbus.xml \ users-service.xml \ users-service.list diff --git a/src/session-dbus.xml b/src/session-dbus.xml new file mode 100644 index 0000000..3ce1693 --- /dev/null +++ b/src/session-dbus.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + -- cgit v1.2.3 From 2922e646021966770309caf17538b4b241885973 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 14:14:12 -0600 Subject: Connecting and registering the dbus object. --- src/session-dbus.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/session-dbus.c b/src/session-dbus.c index 2b7443e..3f5e6c7 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -4,6 +4,10 @@ #include "session-dbus.h" +static gboolean _session_dbus_server_get_icon (SessionDbus * service, gchar ** icon, GError ** error); + +#include "session-dbus-server.h" + typedef struct _SessionDbusPrivate SessionDbusPrivate; struct _SessionDbusPrivate { gint dummy; @@ -29,6 +33,8 @@ session_dbus_class_init (SessionDbusClass *klass) object_class->dispose = session_dbus_dispose; object_class->finalize = session_dbus_finalize; + dbus_g_object_type_install_info(SESSION_DBUS_TYPE, &dbus_glib__session_dbus_server_object_info); + return; } @@ -52,3 +58,10 @@ session_dbus_finalize (GObject *object) G_OBJECT_CLASS (session_dbus_parent_class)->finalize (object); return; } + +static gboolean +_session_dbus_server_get_icon (SessionDbus * service, gchar ** icon, GError ** error) +{ + + return TRUE; +} -- cgit v1.2.3 From d9427c6a4ecc0a50cac8a674c465631c59ff59f2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 14:22:40 -0600 Subject: Setting up the object and giving it a name. --- src/session-dbus.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/session-dbus.c b/src/session-dbus.c index 3f5e6c7..96b4500 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -10,7 +10,7 @@ static gboolean _session_dbus_server_get_icon (SessionDbus * service, gchar ** i typedef struct _SessionDbusPrivate SessionDbusPrivate; struct _SessionDbusPrivate { - gint dummy; + gchar * name; }; #define SESSION_DBUS_GET_PRIVATE(o) \ @@ -41,6 +41,14 @@ session_dbus_class_init (SessionDbusClass *klass) static void session_dbus_init (SessionDbus *self) { + DBusGConnection * session = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + dbus_g_connection_register_g_object(session, "/bob", G_OBJECT(self)); + + SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(self); + + priv->name = g_strdup("icon"); + + return; } static void @@ -54,6 +62,12 @@ session_dbus_dispose (GObject *object) static void session_dbus_finalize (GObject *object) { + SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(object); + + if (priv->name != NULL) { + g_free(priv->name); + priv->name = NULL; + } G_OBJECT_CLASS (session_dbus_parent_class)->finalize (object); return; @@ -62,6 +76,7 @@ session_dbus_finalize (GObject *object) static gboolean _session_dbus_server_get_icon (SessionDbus * service, gchar ** icon, GError ** error) { - + SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(service); + *icon = g_strdup(priv->name); return TRUE; } -- cgit v1.2.3 From a92cec4aa9f3b7a014f9ed0e3dc3b2617e4114be Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 14:26:46 -0600 Subject: providing a set_name function --- src/session-dbus.c | 12 ++++++++++++ src/session-dbus.h | 1 + 2 files changed, 13 insertions(+) diff --git a/src/session-dbus.c b/src/session-dbus.c index 96b4500..cc12311 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -80,3 +80,15 @@ _session_dbus_server_get_icon (SessionDbus * service, gchar ** icon, GError ** e *icon = g_strdup(priv->name); return TRUE; } + +void +session_dbus_set_name (SessionDbus * session, const gchar * name) +{ + SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(session); + if (priv->name != NULL) { + g_free(priv->name); + priv->name = NULL; + } + priv->name = g_strdup(name); + return; +} diff --git a/src/session-dbus.h b/src/session-dbus.h index be57df7..d606378 100644 --- a/src/session-dbus.h +++ b/src/session-dbus.h @@ -25,6 +25,7 @@ struct _SessionDbus { }; GType session_dbus_get_type (void); +void session_dbus_set_name (SessionDbus * session, const gchar * name); G_END_DECLS -- cgit v1.2.3 From 0d2c0778772b92815dd1a773f6a5e10ed3c80869 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 14:33:30 -0600 Subject: Build us a signal --- src/session-dbus.c | 17 +++++++++++++++++ src/session-dbus.h | 1 + 2 files changed, 18 insertions(+) diff --git a/src/session-dbus.c b/src/session-dbus.c index cc12311..fd506ad 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -13,6 +13,14 @@ struct _SessionDbusPrivate { gchar * name; }; +/* Signals */ +enum { + ICON_UPDATED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + #define SESSION_DBUS_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), SESSION_DBUS_TYPE, SessionDbusPrivate)) @@ -33,6 +41,14 @@ session_dbus_class_init (SessionDbusClass *klass) object_class->dispose = session_dbus_dispose; object_class->finalize = session_dbus_finalize; + signals[ICON_UPDATED] = g_signal_new ("icon-updated", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (SessionDbusClass, icon_updated), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + dbus_g_object_type_install_info(SESSION_DBUS_TYPE, &dbus_glib__session_dbus_server_object_info); return; @@ -90,5 +106,6 @@ session_dbus_set_name (SessionDbus * session, const gchar * name) priv->name = NULL; } priv->name = g_strdup(name); + g_signal_emit(G_OBJECT(session), signals[ICON_UPDATED], 0, priv->name, TRUE); return; } diff --git a/src/session-dbus.h b/src/session-dbus.h index d606378..67c151c 100644 --- a/src/session-dbus.h +++ b/src/session-dbus.h @@ -18,6 +18,7 @@ typedef struct _SessionDbusClass SessionDbusClass; struct _SessionDbusClass { GObjectClass parent_class; + void (*icon_updated) (SessionDbus * session, gchar * icon, gpointer user_data); }; struct _SessionDbus { -- cgit v1.2.3 From e504d1d019cf0af9b210d8150a5822f5e4878f4f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 14:37:58 -0600 Subject: Creating our little dbus-object. --- src/session-dbus.c | 6 ++++++ src/session-dbus.h | 1 + src/session-service.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/src/session-dbus.c b/src/session-dbus.c index fd506ad..60002d0 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -97,6 +97,12 @@ _session_dbus_server_get_icon (SessionDbus * service, gchar ** icon, GError ** e return TRUE; } +SessionDbus * +session_dbus_new (void) +{ + return SESSION_DBUS(g_object_new(SESSION_DBUS_TYPE, NULL)); +} + void session_dbus_set_name (SessionDbus * session, const gchar * name) { diff --git a/src/session-dbus.h b/src/session-dbus.h index 67c151c..2169b49 100644 --- a/src/session-dbus.h +++ b/src/session-dbus.h @@ -26,6 +26,7 @@ struct _SessionDbus { }; GType session_dbus_get_type (void); +SessionDbus * session_dbus_new (void); void session_dbus_set_name (SessionDbus * session, const gchar * name); G_END_DECLS diff --git a/src/session-service.c b/src/session-service.c index febf007..693c73a 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -43,6 +43,7 @@ with this program. If not, see . #include "gconf-helper.h" +#include "session-dbus.h" #include "users-service-dbus.h" #include "lock-helper.h" @@ -65,6 +66,7 @@ struct _ActivateData static DBusGConnection *system_bus = NULL; static DBusGProxy *gdm_proxy = NULL; static UsersServiceDbus *dbus_interface = NULL; +static SessionDbus *session_dbus = NULL; static DbusmenuMenuitem *lock_menuitem = NULL; static DbusmenuMenuitem *switch_menuitem = NULL; @@ -691,6 +693,8 @@ main (int argc, char ** argv) DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT); dbusmenu_server_set_root(server, root_menuitem); + session_dbus = session_dbus_new(); + mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 05dbbb9a09bfa74c23683c8110bf0853635a635e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 14:59:01 -0600 Subject: Add shared names for the dbus interfaces. --- src/dbus-shared-names.h | 3 +++ src/session-dbus.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 253cba8..2c30b36 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -38,6 +38,9 @@ with this program. If not, see . #define INDICATOR_SESSION_DBUS_OBJECT "/org/ayatana/indicator/session/menu" #define INDICATOR_SESSION_DBUS_VERSION 0 +#define INDICATOR_SESSION_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/session/service" +#define INDICATOR_SESSION_SERVICE_DBUS_IFACE "org.ayatana.indicator.session.service" + #define USER_ITEM_TYPE "x-canonical-user-item" #define USER_ITEM_PROP_NAME "user-item-name" #define USER_ITEM_PROP_LOGGED_IN "user-item-logged-in" diff --git a/src/session-dbus.c b/src/session-dbus.c index 60002d0..f656bb0 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -3,6 +3,7 @@ #endif #include "session-dbus.h" +#include "dbus-shared-names.h" static gboolean _session_dbus_server_get_icon (SessionDbus * service, gchar ** icon, GError ** error); @@ -58,7 +59,7 @@ static void session_dbus_init (SessionDbus *self) { DBusGConnection * session = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); - dbus_g_connection_register_g_object(session, "/bob", G_OBJECT(self)); + dbus_g_connection_register_g_object(session, INDICATOR_SESSION_SERVICE_DBUS_OBJECT, G_OBJECT(self)); SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(self); -- cgit v1.2.3 From fced2aaae755846922b46fa55a6444f0e0406c8d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 15:08:25 -0600 Subject: Building us a proxy! Now we are dangerous. --- src/indicator-session.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/indicator-session.c b/src/indicator-session.c index a815e40..0b8d77e 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -55,6 +55,7 @@ struct _IndicatorSession { IndicatorServiceManager * service; GtkImage * status_image; DbusmenuGtkMenu * menu; + DBusGProxy * service_proxy; }; GType indicator_session_get_type (void); @@ -109,6 +110,12 @@ indicator_session_init (IndicatorSession *self) dbusmenu_client_add_type_handler(client, MENU_SWITCH_TYPE, build_menu_switch); dbusmenu_client_add_type_handler(client, USER_ITEM_TYPE, new_user_item); + DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + self->service_proxy = dbus_g_proxy_new_for_name(session_bus, + INDICATOR_SESSION_DBUS_NAME, + INDICATOR_SESSION_SERVICE_DBUS_OBJECT, + INDICATOR_SESSION_SERVICE_DBUS_IFACE); + return; } @@ -122,6 +129,11 @@ indicator_session_dispose (GObject *object) self->service = NULL; } + if (self->service_proxy != NULL) { + g_object_unref(self->service_proxy); + self->service_proxy = NULL; + } + G_OBJECT_CLASS (indicator_session_parent_class)->dispose (object); return; } -- cgit v1.2.3 From 10ab858ea1a244f92b57d3e8c96c76045e02e93b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 15:26:50 -0600 Subject: Icon name changing signal for updating the image. --- src/indicator-session.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/indicator-session.c b/src/indicator-session.c index 0b8d77e..c23cd0b 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -70,6 +70,7 @@ static GtkImage * get_icon (IndicatorObject * io); static GtkMenu * get_menu (IndicatorObject * io); static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); +static void icon_changed (DBusGProxy * proxy, gchar * icon_name, gpointer user_data); static void indicator_session_class_init (IndicatorSessionClass *klass); static void indicator_session_init (IndicatorSession *self); @@ -116,6 +117,14 @@ indicator_session_init (IndicatorSession *self) INDICATOR_SESSION_SERVICE_DBUS_OBJECT, INDICATOR_SESSION_SERVICE_DBUS_IFACE); + dbus_g_proxy_add_signal(self->service_proxy, "IconUpdated", + G_TYPE_STRING, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(self->service_proxy, + "IconUpdated", + G_CALLBACK(icon_changed), + self, + NULL); + return; } @@ -152,6 +161,14 @@ get_label (IndicatorObject * io) return NULL; } +static void +icon_changed (DBusGProxy * proxy, gchar * icon_name, gpointer user_data) +{ + IndicatorSession * session = INDICATOR_SESSION(user_data); + gtk_image_set_from_icon_name(session->status_image, icon_name, GTK_ICON_SIZE_MENU); + return; +} + static GtkImage * get_icon (IndicatorObject * io) { -- cgit v1.2.3 From 802d6447947701b2578a29babd2357642b982645 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 15:35:07 -0600 Subject: Setting the icon to something sensable --- src/session-dbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session-dbus.c b/src/session-dbus.c index f656bb0..7159d7f 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -63,7 +63,7 @@ session_dbus_init (SessionDbus *self) SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(self); - priv->name = g_strdup("icon"); + priv->name = g_strdup("system-shutdown-panel"); return; } -- cgit v1.2.3 From 746636765323cb223ef84af13920a9620176eb4f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 15:47:33 -0600 Subject: Getting the icon, but only when we're connected. --- src/indicator-session.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/indicator-session.c b/src/indicator-session.c index c23cd0b..6e259dc 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -35,6 +35,7 @@ with this program. If not, see . #include "dbus-shared-names.h" #include "dbusmenu-shared.h" +#include "session-dbus-client.h" #define INDICATOR_SESSION_TYPE (indicator_session_get_type ()) #define INDICATOR_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SESSION_TYPE, IndicatorSession)) @@ -71,6 +72,7 @@ static GtkMenu * get_menu (IndicatorObject * io); static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); static void icon_changed (DBusGProxy * proxy, gchar * icon_name, gpointer user_data); +static void service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointer user_data); static void indicator_session_class_init (IndicatorSessionClass *klass); static void indicator_session_init (IndicatorSession *self); @@ -103,6 +105,7 @@ indicator_session_init (IndicatorSession *self) /* Now let's fire these guys up. */ self->service = indicator_service_manager_new_version(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_VERSION); + g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(service_connection_cb), self); self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU)); self->menu = dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT); @@ -155,6 +158,28 @@ indicator_session_finalize (GObject *object) return; } +static void +icon_name_get_cb (DBusGProxy *proxy, char * OUT_name, GError *error, gpointer userdata) +{ + IndicatorSession * self = INDICATOR_SESSION(userdata); + gtk_image_set_from_icon_name(self->status_image, OUT_name, GTK_ICON_SIZE_MENU); + return; +} + +static void +service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) +{ + IndicatorSession * self = INDICATOR_SESSION(user_data); + + if (connected) { + org_ayatana_indicator_session_service_get_icon_async(self->service_proxy, icon_name_get_cb, user_data); + } else { + gtk_image_set_from_icon_name(self->status_image, "system-shutdown-panel", GTK_ICON_SIZE_MENU); + } + + return; +} + static GtkLabel * get_label (IndicatorObject * io) { -- cgit v1.2.3 From 2dd05e216cdc0e7ab9318a410758eade2d3e68a4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 15:49:52 -0600 Subject: Moving the icon names into the shared header files --- src/dbus-shared-names.h | 3 +++ src/indicator-session.c | 4 ++-- src/session-dbus.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 2c30b36..8cbb488 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -45,4 +45,7 @@ with this program. If not, see . #define USER_ITEM_PROP_NAME "user-item-name" #define USER_ITEM_PROP_LOGGED_IN "user-item-logged-in" +#define ICON_DEFAULT "system-shutdown-panel" +#define ICON_RESTART "system-shutdown-restart-panel" + #endif /* __DBUS_SHARED_NAMES_H__ */ diff --git a/src/indicator-session.c b/src/indicator-session.c index 6e259dc..de18bb3 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -107,7 +107,7 @@ indicator_session_init (IndicatorSession *self) self->service = indicator_service_manager_new_version(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_VERSION); g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(service_connection_cb), self); - self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU)); + self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name(ICON_DEFAULT, GTK_ICON_SIZE_MENU)); self->menu = dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT); DbusmenuClient * client = DBUSMENU_CLIENT(dbusmenu_gtkmenu_get_client(self->menu)); @@ -174,7 +174,7 @@ service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointe if (connected) { org_ayatana_indicator_session_service_get_icon_async(self->service_proxy, icon_name_get_cb, user_data); } else { - gtk_image_set_from_icon_name(self->status_image, "system-shutdown-panel", GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name(self->status_image, ICON_DEFAULT, GTK_ICON_SIZE_MENU); } return; diff --git a/src/session-dbus.c b/src/session-dbus.c index 7159d7f..1413916 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -63,7 +63,7 @@ session_dbus_init (SessionDbus *self) SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(self); - priv->name = g_strdup("system-shutdown-panel"); + priv->name = g_strdup(ICON_DEFAULT); return; } -- cgit v1.2.3 From 5d784227da6b87b8588724ac1d894c6116fc2b01 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 15:52:13 -0600 Subject: Setting the icon when the restart is touched. --- src/session-service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/session-service.c b/src/session-service.c index 693c73a..6c4dd1b 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -622,6 +622,7 @@ restart_dir_changed (void) dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required...")); } dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important"); + session_dbus_set_name(session_dbus, ICON_RESTART); } else { if (supress_confirmations()) { dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); @@ -629,6 +630,7 @@ restart_dir_changed (void) dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); } dbusmenu_menuitem_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME); + session_dbus_set_name(session_dbus, ICON_DEFAULT); } return; -- cgit v1.2.3 From 78211dc46ae22a439653df6db0f3b6e9c67160f0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 16:07:33 -0600 Subject: Protecting from a NULL object --- src/session-service.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 6c4dd1b..b88ee30 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -622,15 +622,19 @@ restart_dir_changed (void) dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required...")); } dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important"); - session_dbus_set_name(session_dbus, ICON_RESTART); - } else { + if (session_dbus != NULL) { + session_dbus_set_name(session_dbus, ICON_RESTART); + } + } else { if (supress_confirmations()) { dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); } else { dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); } dbusmenu_menuitem_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME); - session_dbus_set_name(session_dbus, ICON_DEFAULT); + if (session_dbus != NULL) { + session_dbus_set_name(session_dbus, ICON_DEFAULT); + } } return; -- cgit v1.2.3 From 91d75debaa1a5aa7c210da029ab123c96633225b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 16:08:28 -0600 Subject: Making our service come up a little earlier --- src/session-service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index b88ee30..75c8650 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -674,6 +674,8 @@ main (int argc, char ** argv) INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_shutdown), NULL); + session_dbus = session_dbus_new(); + g_idle_add(lock_screen_setup, NULL); root_menuitem = dbusmenu_menuitem_new(); @@ -699,8 +701,6 @@ main (int argc, char ** argv) DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT); dbusmenu_server_set_root(server, root_menuitem); - session_dbus = session_dbus_new(); - mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 8d65fd684fb6672d513bb1cf29e182ee5696a375 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 16:10:57 -0600 Subject: Copyright headers --- src/session-dbus.c | 21 +++++++++++++++++++++ src/session-dbus.h | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/session-dbus.c b/src/session-dbus.c index 1413916..20a0fa0 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -1,3 +1,24 @@ +/* +The Dbus object on the bus for the indicator. + +Copyright 2010 Canonical Ltd. + +Authors: + Ted Gould + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/session-dbus.h b/src/session-dbus.h index 2169b49..792917b 100644 --- a/src/session-dbus.h +++ b/src/session-dbus.h @@ -1,3 +1,24 @@ +/* +The Dbus object on the bus for the indicator. + +Copyright 2010 Canonical Ltd. + +Authors: + Ted Gould + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + #ifndef __SESSION_DBUS_H__ #define __SESSION_DBUS_H__ -- cgit v1.2.3 From 44d2e3243736990ca867eba36f4371252e2adf11 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 16:19:05 -0600 Subject: Keeping the names the same for now, until we have artwork. --- src/dbus-shared-names.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 8cbb488..11d62bb 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -46,6 +46,6 @@ with this program. If not, see . #define USER_ITEM_PROP_LOGGED_IN "user-item-logged-in" #define ICON_DEFAULT "system-shutdown-panel" -#define ICON_RESTART "system-shutdown-restart-panel" +#define ICON_RESTART "system-shutdown-panel" #endif /* __DBUS_SHARED_NAMES_H__ */ -- cgit v1.2.3 From ed42cead787b5877b8708ecf5ed8f88159026be9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 16:26:12 -0600 Subject: Upping libindicator dep to 0.3.5 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f79fa93..da38826 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ########################### GTK_REQUIRED_VERSION=2.12 -INDICATOR_REQUIRED_VERSION=0.3.0 +INDICATOR_REQUIRED_VERSION=0.3.5 DBUSMENUGTK_REQUIRED_VERSION=0.2.2 POLKIT_REQUIRED_VERSION=0.92 -- cgit v1.2.3 From b419d049e7fe398e52739183f26cd486b7d9c421 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 16:33:33 -0600 Subject: Using the libindicator helpers so we get things like fallbacks! \o/ --- src/indicator-session.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index de18bb3..0282616 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -32,6 +32,7 @@ with this program. If not, see . #include #include #include +#include #include "dbus-shared-names.h" #include "dbusmenu-shared.h" @@ -107,7 +108,7 @@ indicator_session_init (IndicatorSession *self) self->service = indicator_service_manager_new_version(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_VERSION); g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(service_connection_cb), self); - self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name(ICON_DEFAULT, GTK_ICON_SIZE_MENU)); + self->status_image = indicator_image_helper(ICON_DEFAULT); self->menu = dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT); DbusmenuClient * client = DBUSMENU_CLIENT(dbusmenu_gtkmenu_get_client(self->menu)); @@ -162,7 +163,7 @@ static void icon_name_get_cb (DBusGProxy *proxy, char * OUT_name, GError *error, gpointer userdata) { IndicatorSession * self = INDICATOR_SESSION(userdata); - gtk_image_set_from_icon_name(self->status_image, OUT_name, GTK_ICON_SIZE_MENU); + indicator_image_helper_update(self->status_image, OUT_name); return; } @@ -174,7 +175,7 @@ service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointe if (connected) { org_ayatana_indicator_session_service_get_icon_async(self->service_proxy, icon_name_get_cb, user_data); } else { - gtk_image_set_from_icon_name(self->status_image, ICON_DEFAULT, GTK_ICON_SIZE_MENU); + indicator_image_helper_update(self->status_image, ICON_DEFAULT); } return; @@ -190,7 +191,7 @@ static void icon_changed (DBusGProxy * proxy, gchar * icon_name, gpointer user_data) { IndicatorSession * session = INDICATOR_SESSION(user_data); - gtk_image_set_from_icon_name(session->status_image, icon_name, GTK_ICON_SIZE_MENU); + indicator_image_helper_update(session->status_image, icon_name); return; } -- cgit v1.2.3 From 7810d87175072ed195fdde952d140f23150ac342 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 21:52:22 -0600 Subject: Adding in gio-unix for desktop file reading --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index f79fa93..7d11d49 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,7 @@ AC_SUBST(APPLET_LIBS) DBUSMENUGLIB_REQUIRED_VERSION=0.1.1 PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION + gio-unix-2.0 indicator >= $INDICATOR_REQUIRED_VERSION) AC_SUBST(SESSIONERVICE_CFLAGS) -- cgit v1.2.3 From 501c8a7e9add926f34b6dbbcce9d9e6f81706445 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 21:54:12 -0600 Subject: Looking for a desktop file, and if it exists, putting it as a final menu item. --- src/session-service.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/session-service.c b/src/session-service.c index 51a930a..c98ecff 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -28,6 +28,7 @@ with this program. If not, see . #include #include +#include #include #include @@ -50,6 +51,8 @@ with this program. If not, see . #define UP_OBJECT "/org/freedesktop/UPower" #define UP_INTERFACE "org.freedesktop.UPower" +#define DESKTOP_FILE "/usr/share/applications/indicator-session-extra.desktop" + #define GUEST_SESSION_LAUNCHER "/usr/share/gdm/guest-session/guest-session-launch" #define LOCKDOWN_DIR "/desktop/gnome/lockdown" @@ -415,6 +418,16 @@ compare_users_by_username (const gchar *a, return retval; } +/* Take a desktop file and execute it */ +static void +desktop_activate_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer data) +{ + GAppInfo * appinfo = G_APP_INFO(data); + g_return_if_fail(appinfo != NULL); + g_app_info_launch(appinfo, NULL, NULL, NULL); + return; +} + /* Builds up the menu for us */ static void rebuild_items (DbusmenuMenuitem *root, @@ -580,6 +593,21 @@ rebuild_items (DbusmenuMenuitem *root, update_menu_entries(restart_shutdown_logout_mi); + if (g_file_test(DESKTOP_FILE, G_FILE_TEST_EXISTS)) { + GAppInfo * appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(DESKTOP_FILE)); + + if (appinfo != NULL) { + DbusmenuMenuitem * separator = dbusmenu_menuitem_new(); + dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); + dbusmenu_menuitem_child_append(root, separator); + + DbusmenuMenuitem * desktop_mi = dbusmenu_menuitem_new(); + dbusmenu_menuitem_property_set(desktop_mi, DBUSMENU_MENUITEM_PROP_LABEL, g_app_info_get_name(appinfo)); + g_signal_connect(G_OBJECT(desktop_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(desktop_activate_cb), appinfo); + dbusmenu_menuitem_child_append(root, desktop_mi); + } + } + return; } -- cgit v1.2.3