← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-session/oneiric-updates

« back to all changes in this revision

Viewing changes to .pc/97_fix_query_end_session_crash.patch/gnome-session/gsm-xsmp-client.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-05-24 12:12:31 UTC
  • mfrom: (1.1.67 upstream) (2.1.10 experimental)
  • Revision ID: james.westby@ubuntu.com-20110524121231-rqzyr2eke6xhk1c8
Tags: 3.0.2-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/97_fix_query_end_session_crash.patch/gnome-session/gsm-xsmp-client.c
36
36
 
37
37
#include "gsm-util.h"
38
38
#include "gsm-autostart-app.h"
 
39
#include "gsm-icon-names.h"
39
40
#include "gsm-manager.h"
40
41
 
41
42
#define GsmDesktopFile "_GSM_DesktopFile"
505
506
{
506
507
        SmProp     *prop;
507
508
        char       *desktop_file_path = NULL;
508
 
        char      **dirs;
509
509
        const char *program_name;
510
510
 
511
511
        /* XSMP clients using eggsmclient defines a special property
524
524
        prop = find_property (client, SmProgram, NULL);
525
525
        program_name = prop->vals[0].value;
526
526
 
527
 
        dirs = gsm_util_get_autostart_dirs ();
528
 
 
529
527
        desktop_file_path =
530
528
                gsm_util_find_desktop_file_for_app_name (program_name,
531
 
                                                         dirs);
532
 
 
533
 
        g_strfreev (dirs);
 
529
                                                         TRUE, FALSE);
534
530
 
535
531
out:
536
532
        g_debug ("GsmXSMPClient: desktop file for client %s is %s",
567
563
        g_key_file_set_string (keyfile,
568
564
                               G_KEY_FILE_DESKTOP_GROUP,
569
565
                               G_KEY_FILE_DESKTOP_KEY_ICON,
570
 
                               "system-run");
 
566
                               GSM_ICON_XSMP_DEFAULT);
571
567
 
572
568
        g_key_file_set_string (keyfile,
573
569
                               G_KEY_FILE_DESKTOP_GROUP,