← Back to branch summary

~tsimpson/mplayer/use-libgif4

« back to all changes in this revision

Viewing changes to libvo/gnome_screensaver.c

  • Committer: Mario Limonciello
  • Date: 2007-12-11 14:07:15 UTC
  • Revision ID: supermario@kingkoopa-20071211140715-xwgykdp5aasqb3l9
Fix errors with gnome-screensaver and gmplayer

Show diffs side-by-side

added added

removed removed

Lines of Context:
libvo/gnome_screensaver.c
40
40
    error = NULL;
41
41
    connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
42
42
    if (connection == NULL) {
43
 
        mp_msg(MSGT_VO, MSGL_ERR,
 
43
        mp_msg(MSGT_VO, MSGL_V,
44
44
               funcname, MSGTR_OpenBusConnectionError, error->message);
45
45
        g_error_free(error);
46
46
        return;
56
56
        error = NULL;
57
57
        ret =
58
58
            dbus_g_proxy_call(proxy, "UnInhibit", &error, G_TYPE_UINT,
59
 
                              cookie, G_TYPE_INVALID);
 
59
                              cookie, G_TYPE_INVALID, G_TYPE_INVALID);
60
60
 
61
61
        /* If this fails, try the GNOME screensaver 2.14 API */
62
62
        if (!ret && error->domain == DBUS_GERROR
100
100
        /* Check if it's a remote exception or a regular GError */
101
101
        if (error->domain == DBUS_GERROR
102
102
            && error->code == DBUS_GERROR_REMOTE_EXCEPTION) {
103
 
            mp_msg(MSGT_VO, MSGL_ERR,
 
103
            mp_msg(MSGT_VO, MSGL_V,
104
104
                   funcname, MSGTR_RemoteMethodException,
105
105
                   dbus_g_error_get_name(error), error->message);
106
106
        }
107
107
        else {
108
 
            mp_msg(MSGT_VO, MSGL_ERR,
 
108
            mp_msg(MSGT_VO, MSGL_V,
109
109
                   funcname, MSGTR_GError, error->message);
110
110
        }
111
111
        g_error_free(error);