← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnome-session/natty-proposed

« back to all changes in this revision

Viewing changes to .pc/06_nuke_session_saving.patch/gnome-session/gsm-session-fill.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-04-26 12:49:01 UTC
  • Revision ID: james.westby@ubuntu.com-20110426124901-ek4wyqqkjq8peyzp
Tags: 2.32.1-0ubuntu20
https://launchpad.net/bugs/758621
* debian/patches/02_add_ubuntu_session.patch,
  debian/patches/05_enhance_fallback_mode.patch:
  - load the fallback message with the right locale (LP: #758621)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/06_nuke_session_saving.patch/gnome-session/gsm-session-fill.c
320
320
        char     *fallback_session_key = NULL;
321
321
        char     *fallback_message_key = NULL;
322
322
        char     *fallback_message = NULL;
 
323
        char     *fallback_message_untranslated = NULL;
 
324
        char     *domain = NULL;
323
325
 
324
326
        g_debug ("fill: *** Getting session '%s'", session);
325
327
 
388
390
        if (!g_file_test ("/rofs", G_FILE_TEST_IS_DIR))
389
391
        {
390
392
                fallback_message_key = g_strdup_printf ("%s%s", fallback_session_key, GSM_KEYFILE_FALLBACKMSG_SUFFIX);
391
 
                fallback_message = g_key_file_get_string (keyfile,
392
 
                                                          GSM_KEYFILE_SESSION_GROUP, fallback_message_key,
393
 
                                                                                                      NULL);
 
393
                fallback_message_untranslated = g_key_file_get_string (keyfile,
 
394
                                                                       GSM_KEYFILE_SESSION_GROUP, fallback_message_key,
 
395
                                                                                                                   NULL);
 
396
                domain = g_key_file_get_string (keyfile, G_KEY_FILE_DESKTOP_GROUP,
 
397
                                                "X-Ubuntu-Gettext-Domain", NULL);
 
398
                if (domain)
 
399
                        fallback_message = g_strdup (dgettext (domain, fallback_message_untranslated));
 
400
                else
 
401
                        fallback_message = g_strdup (fallback_message_untranslated);
 
402
                g_free (fallback_message_untranslated);
394
403
        }
395
404
 
396
405
        if (!IS_STRING_EMPTY (fallback_message)) {