Index: ChangeLog =================================================================== RCS file: /cvs/gnome/evince/ChangeLog,v retrieving revision 1.766 diff -u -u -r1.766 ChangeLog --- ChangeLog 10 Feb 2006 04:36:12 -0000 1.766 +++ ChangeLog 12 Feb 2006 17:43:18 -0000 @@ -1,3 +1,10 @@ +2006-02-12 Carlos Garcia Campos + + * shell/ev-application.c: + + Use DBUS_NAME_FLAG_DO_NOT_QUEUE flag in RequestName method when + dbus>=0.60, so that the request is not queued. + 2006-02-10 Nickolay V. Shmyrev * configure.ac: Index: shell/ev-application.c =================================================================== RCS file: /cvs/gnome/evince/shell/ev-application.c,v retrieving revision 1.29 diff -u -u -r1.29 ev-application.c --- shell/ev-application.c 21 Jan 2006 19:17:11 -0000 1.29 +++ shell/ev-application.c 12 Feb 2006 17:43:18 -0000 @@ -73,12 +73,22 @@ DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); +#if DBUS_VERSION >= 60 if (!org_freedesktop_DBus_request_name (driver_proxy, APPLICATION_SERVICE_NAME, + DBUS_NAME_FLAG_DO_NOT_QUEUE, + &request_name_result, &err)) { + g_warning ("Service registration failed."); + g_clear_error (&err); + } +#else + if (!org_freedesktop_DBus_request_name (driver_proxy, + APPLICATION_SERVICE_NAME, 0, &request_name_result, &err)) { g_warning ("Service registration failed."); g_clear_error (&err); } +#endif if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) { return FALSE;