[file-roller] Application name appears untranslated

[Paolo Bacchilega <paobac src gnome org>]

commit 34ebf41ac6453f3f55a0754ac0b1b4fbb32ac7fd
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Oct 28 09:05:21 2013 +0100

    Application name appears untranslated
    
    [bug #710982]

 copy-n-paste/eggdesktopfile.c   |    7 +++++--
 copy-n-paste/eggsmclient-xsmp.c |    7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/copy-n-paste/eggdesktopfile.c b/copy-n-paste/eggdesktopfile.c
index c59ff65..e6692e1 100644
--- a/copy-n-paste/eggdesktopfile.c
+++ b/copy-n-paste/eggdesktopfile.c
@@ -203,8 +203,11 @@ egg_desktop_file_new_from_key_file (GKeyFile    *key_file,
   else
     desktop_file->source = g_strdup (source);
 
-  desktop_file->name = g_key_file_get_string (key_file, EGG_DESKTOP_FILE_GROUP,
-                                             EGG_DESKTOP_FILE_KEY_NAME, error);
+  desktop_file->name = g_key_file_get_locale_string (key_file,
+                                                    EGG_DESKTOP_FILE_GROUP,
+                                                    EGG_DESKTOP_FILE_KEY_NAME,
+                                                    NULL,
+                                                    error);
   if (!desktop_file->name)
     {
       egg_desktop_file_free (desktop_file);
diff --git a/copy-n-paste/eggsmclient-xsmp.c b/copy-n-paste/eggsmclient-xsmp.c
index ec1b594..d5cf3b5 100644
--- a/copy-n-paste/eggsmclient-xsmp.c
+++ b/copy-n-paste/eggsmclient-xsmp.c
@@ -193,6 +193,11 @@ egg_sm_client_xsmp_class_init (EggSMClientXSMPClass *klass)
 EggSMClient *
 egg_sm_client_xsmp_new (void)
 {
+#if GTK_CHECK_VERSION(3,0,0)
+  if (!GDK_IS_X11_DISPLAY_MANAGER (gdk_display_manager_get ()))
+    return NULL;
+#endif
+
   if (!g_getenv ("SESSION_MANAGER"))
     return NULL;
 
@@ -368,7 +373,7 @@ sm_client_xsmp_startup (EggSMClient *client,
       free (ret_client_id);
 
       gdk_threads_enter ();
-#if !GTK_CHECK_VERSION(2,91,7) && !GTK_CHECK_VERSION(3,0,0)
+#if !GTK_CHECK_VERSION(2,23,3) && !GTK_CHECK_VERSION(3,0,0)
       gdk_set_sm_client_id (xsmp->client_id);
 #else
       gdk_x11_set_sm_client_id (xsmp->client_id);