← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to libbrasero-burn/burn-dbus.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-09-08 09:33:41 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090908093341-jh02q5ba0q8jyu9l
Tags: 2.27.92-0ubuntu1
https://launchpad.net/bugs/425998
https://launchpad.net/bugs/354995
* New upstream release (LP: #425998)
  - Some improvements when handling DVD-RW sequential
  - #593829 - Brasero gets stuck in a loop at "Getting size" while burning another session on a multi-session disk
  - #578466 - Unable to overburn
  - #593314 - Brasero is failing to burn from sftp
  - #593492 - Compilation must be ordered by file name
  - #587122 - Copying DVD - "Error while reading video DVD (no error)"
  - #592026 - brasero crashes when eject a medium
  - #592025 - brasero crashes on detecting src images on a NFS path when preparing burning an image
  - #591880 - Image checksumming causes internal error (LP: #354995)
  - #591397 - Brasero Main window pops up after exiting from Image Burning window.
  - Translation updates
  - lots of small fixes and improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
libbrasero-burn/burn-dbus.c
37
37
#include <dbus/dbus-glib.h>
38
38
#include "burn-dbus.h"
39
39
 
40
 
#define GPM_DBUS_SERVICE                "org.freedesktop.PowerManagement"
41
 
#define GPM_DBUS_INHIBIT_PATH           "/org/freedesktop/PowerManagement/Inhibit"
42
 
#define GPM_DBUS_INHIBIT_INTERFACE      "org.freedesktop.PowerManagement.Inhibit"
 
40
#define GS_DBUS_SERVICE                 "org.gnome.SessionManager"
 
41
#define GS_DBUS_INHIBIT_PATH            "/org/gnome/SessionManager"
 
42
#define GS_DBUS_INHIBIT_INTERFACE       "org.gnome.SessionManager"
43
43
 
44
44
void 
45
45
brasero_uninhibit_suspend (guint cookie)
63
63
        }
64
64
 
65
65
        proxy = dbus_g_proxy_new_for_name (conn,
66
 
                                           GPM_DBUS_SERVICE,
67
 
                                           GPM_DBUS_INHIBIT_PATH,
68
 
                                           GPM_DBUS_INHIBIT_INTERFACE);
 
66
                                           GS_DBUS_SERVICE,
 
67
                                           GS_DBUS_INHIBIT_PATH,
 
68
                                           GS_DBUS_INHIBIT_INTERFACE);
69
69
        if (proxy == NULL) {
70
 
                g_warning ("Could not get DBUS proxy: %s", GPM_DBUS_SERVICE);
 
70
                g_warning ("Could not get DBUS proxy: %s", GS_DBUS_SERVICE);
71
71
                dbus_g_connection_unref (conn);
72
72
                return;
73
73
        }
74
74
 
75
75
        res = dbus_g_proxy_call (proxy,
76
 
                                 "UnInhibit", &error,
 
76
                                 "Uninhibit", &error,
77
77
                                 G_TYPE_UINT, cookie,
78
78
                                 G_TYPE_INVALID,
79
79
                                 G_TYPE_INVALID);
107
107
        }
108
108
 
109
109
        proxy = dbus_g_proxy_new_for_name (conn,
110
 
                                           GPM_DBUS_SERVICE,
111
 
                                           GPM_DBUS_INHIBIT_PATH,
112
 
                                           GPM_DBUS_INHIBIT_INTERFACE);
 
110
                                           GS_DBUS_SERVICE,
 
111
                                           GS_DBUS_INHIBIT_PATH,
 
112
                                           GS_DBUS_INHIBIT_INTERFACE);
113
113
        
114
114
        if (proxy == NULL) {
115
 
                g_warning ("Could not get DBUS proxy: %s", GPM_DBUS_SERVICE);
 
115
                g_warning ("Could not get DBUS proxy: %s", GS_DBUS_SERVICE);
116
116
                return -1;
117
117
        }
118
118
 
119
119
        res = dbus_g_proxy_call (proxy,
120
120
                                 "Inhibit", &error,
121
 
                                 G_TYPE_STRING, "Brasero",
122
 
                                 G_TYPE_STRING, reason,
 
121
                                 G_TYPE_STRING, "Brasero", /* app_id */
 
122
                                 G_TYPE_UINT, 0,           /* toplevel_xid */
 
123
                                 G_TYPE_STRING, reason,    /* reason */
 
124
                                 G_TYPE_UINT, 1 | 4,       /* flags (prevent logout, suspend) */
123
125
                                 G_TYPE_INVALID,
124
126
                                 G_TYPE_UINT, &cookie,
125
127
                                 G_TYPE_INVALID);