← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gnome-power-manager/intrepid-proposed

« back to all changes in this revision

Viewing changes to src/gpm-main.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-08-19 13:55:19 UTC
  • mfrom: (2.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20080819135519-l130mnhuu3dnh28l
Tags: 2.23.6-0ubuntu1
* debian/patches/09_lid_always_blanks.patch: Update for new upstream
* debian/control, added PolicyKit DBus and Grant to reflect changes
  in upstream configure files.
* Updated upstream version (2.23.6)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gpm-main.c
78
78
                gpm_debug ("ERROR: %s", error->message);
79
79
                g_error_free (error);
80
80
        }
81
 
        if (ret == FALSE) {
 
81
        if (!ret) {
82
82
                /* abort as the DBUS method failed */
83
83
                gpm_warning ("RequestName failed!");
84
84
                return FALSE;
180
180
        master = gnome_master_client ();
181
181
        flags = gnome_client_get_flags (master);
182
182
 
183
 
        if (version == TRUE) {
 
183
        if (version) {
184
184
                g_print ("Version %s\n", VERSION);
185
185
                goto unref_program;
186
186
        }
246
246
 
247
247
        /* Only timeout and close the mainloop if we have specified it
248
248
         * on the command line */
249
 
        if (timed_exit == TRUE) {
 
249
        if (timed_exit) {
250
250
                g_timeout_add (1000 * 20, (GSourceFunc) timed_exit_cb, loop);
251
251
        }
252
252