Merge lp:~indicator-applet-developers/indicator-session/ubuntu into lp:~ubuntu-desktop/indicator-session/ubuntu

[Ted Gould]

0.2.7

[Ken VanDine (ken-vandine)]

Approved!

review: Approve

[Ken VanDine (ken-vandine)]

Manually merged into lp:ubuntu/indicator-session

=== modified file 'configure.ac'
--- configure.ac	2010-03-18 19:19:39 +0000
+++ configure.ac	2010-03-25 14:52:30 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.2.6)
+AM_INIT_AUTOMAKE(indicator-session, 0.2.7)
 
 AM_MAINTAINER_MODE
 

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-23 17:59:37 +0000
+++ debian/changelog	2010-03-25 14:52:30 +0000
@@ -1,3 +1,15 @@
+indicator-session (0.2.7-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release 0.2.7
+    * Adding a switch for translators if the "Switch From"
+      translation doesn't make sense (LP: #545893)
+    * Scale avatar icons to menu size (LP: #542505)
+    * Fix strings to have all be "Shut Down" (LP: #545578)
+  * Remove debian/patches/restore_lock_screen.patch added by
+    downstream.
+
+ -- Ted Gould <[e-mail]>  Thu, 25 Mar 2010 09:40:31 -0500
+
 indicator-session (0.2.6-0ubuntu2) lucid; urgency=low
 
   * debian/control: 

=== removed file 'debian/patches/restore_lock_screen.patch'
--- debian/patches/restore_lock_screen.patch	2010-03-23 17:59:37 +0000
+++ debian/patches/restore_lock_screen.patch	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-=== modified file 'src/lock-helper.c'
---- src/lock-helper.c	2010-03-18 19:19:39 +0000
-+++ src/lock-helper.c	2010-03-23 17:47:37 +0000
-@@ -131,11 +131,12 @@
- 		return FALSE;
- 	}
- 
--	if (gconf_client == NULL) {
-+	/* if (gconf_client == NULL) {
- 		gconf_client = gconf_client_get_default();
- 	}
- 
--	return gconf_client_get_bool (gconf_client, GCONF_KEY, NULL);
-+	return gconf_client_get_bool (gconf_client, GCONF_KEY, NULL); */
-+	return TRUE;
- }
- 
- /* When the screensave go active, if we've got a mainloop
-

=== modified file 'src/dialog.c'
--- src/dialog.c	2010-03-04 02:37:47 +0000
+++ src/dialog.c	2010-03-25 14:52:30 +0000
@@ -34,7 +34,7 @@
 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")
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("title", "Shut Down")
 };
 
 static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = {
@@ -46,7 +46,7 @@
 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")
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button", "Shut Down")
 };
 
 /* TRANSLATORS: These strings have an ellipsis so that the user knows
@@ -54,7 +54,7 @@
 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...")
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button auth", "Shut Down...")
 };
 
 /* TRANSLATORS: This button appears on the logout dialog when

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2010-03-18 19:19:39 +0000
+++ src/indicator-session.c	2010-03-25 14:52:30 +0000
@@ -243,12 +243,26 @@
 	const gchar * icon_name = dbusmenu_menuitem_property_get(newitem, USER_ITEM_PROP_ICON);
 	g_debug("Using user icon for '%s' from file: %s", dbusmenu_menuitem_property_get(newitem, USER_ITEM_PROP_NAME), icon_name);
 	if (icon_name != NULL && icon_name[0] != '\0') {
-		if (g_strcmp0(icon_name, USER_ITEM_ICON_DEFAULT) == 0 || !g_file_test(icon_name, G_FILE_TEST_EXISTS)) {
+		if (g_strcmp0(icon_name, USER_ITEM_ICON_DEFAULT) != 0 && g_file_test(icon_name, G_FILE_TEST_EXISTS)) {
+			gint width, height;
+			gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
+
+			GError * error = NULL;
+			GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file_at_size(icon_name, width, height, &error);
+
+			if (error == NULL) {
+				usericon = gtk_image_new_from_pixbuf(pixbuf);
+				g_object_unref(pixbuf);
+			} else {
+				g_warning("Unable to load user icon '%s': %s", icon_name, error->message);
+				g_error_free(error);
+			}
+		}
+
+		if (usericon == NULL) {
 			GIcon * gicon = g_themed_icon_new_with_default_fallbacks("stock_person-panel");
 			usericon = gtk_image_new_from_gicon(gicon, GTK_ICON_SIZE_MENU);
 			g_object_unref(gicon);
-		} else {
-			usericon = gtk_image_new_from_file(icon_name);
 		}
 	}
 	if (usericon != NULL) {
@@ -300,11 +314,20 @@
 	GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(DBUSMENU_GTKCLIENT(user_data), item);
 	gchar * finalstring = NULL;
 	gboolean set_ellipsize = FALSE;
+	gboolean no_name_in_lang = FALSE;
+
+	/* TRANSLATORS: Translate the '1' below into anything other than
+	   '1' if "Switch From %s..." doesn't make sense in your language.
+	   Instead, the string "Switch User..." will be used. */
+	const gchar * translate = C_("session_menu:switchfrom", "1");
+	if (g_strcmp0(translate, "1") != 0) {
+		no_name_in_lang = TRUE;
+	}
 
 	/* 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') {
+	if (value == NULL || g_value_get_string(value) == NULL || g_value_get_string(value)[0] == '\0' || no_name_in_lang) {
 		finalstring = _("Switch User...");
 		set_ellipsize = FALSE;
 	}