← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-keyring/trusty-updates

« back to all changes in this revision

Viewing changes to daemon/gkd-main.c

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-08-24 10:32:10 UTC
  • mfrom: (1.1.80)
  • Revision ID: package-import@ubuntu.com-20120824103210-g4880o16ruf5dq0y
Tags: 3.5.90-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/gkd-main.c
586
586
{
587
587
        gboolean ret;
588
588
 
589
 
        g_free (control_directory);
590
 
        control_directory = g_strdup (directory);
591
 
        ret = gkd_control_quit (directory);
 
589
        /*
 
590
         * The first control_directory is the environment one, always
 
591
         * prefer that since it's the one that ssh and gpg will connect to
 
592
         */
 
593
        if (control_directory == NULL)
 
594
                control_directory = g_strdup (directory);
 
595
 
 
596
        ret = gkd_control_quit (directory, GKD_CONTROL_QUIET_IF_NO_PEER);
592
597
 
593
598
        /*
594
599
         * If we quit, wait a short time before initializing so the other
597
602
        if (ret == TRUE)
598
603
                g_usleep (200 * 1000); /* 200 ms in us */
599
604
 
600
 
        return ret;
 
605
        /*
 
606
         * Note that we don't return TRUE, since we want to quit all the
 
607
         * running daemons (for this session) that may have been started
 
608
         * by dbus or elsewhere.
 
609
         */
 
610
 
 
611
        return FALSE;
601
612
}
602
613
 
603
614
typedef gboolean (*DiscoverFunc) (const gchar *control_directory);
946
957
        } else if (run_for_replace) {
947
958
                discover_other_daemon (replace_daemon_at, FALSE);
948
959
                if (control_directory)
949
 
                        g_message ("replacing daemon at: %s", control_directory);
 
960
                        g_message ("Replacing daemon, using directory: %s", control_directory);
 
961
                else
 
962
                        g_message ("Could not find daemon to replace, staring normally");
950
963
        }
951
964
 
952
965
        /* Initialize the main directory */