diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-01-08 19:04:26 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-01-08 19:04:26 (GMT) |
| commit | 8c83adb77352c7b8457b14efecc254a1d3f20a2e (patch) | |
| tree | 37cabc10a209a3b84df763cff1ac1c66eb3e5de8 /shell/ev-application.c | |
| parent | 64135b8c178595cba4696564a83134b0568a75ea (diff) | |
Bump requirements to dbus-glib 0.71 and drop all ifdefs used.
2007-01-08 Carlos Garcia Campos <carlosgc@gnome.org>
* configure.ac:
* shell/ev-application.c: (ev_application_register_service):
* shell/main.c: (load_files_remote):
Bump requirements to dbus-glib 0.71 and drop all ifdefs used.
svn path=/trunk/; revision=2201
Diffstat (limited to 'shell/ev-application.c')
| -rw-r--r-- | shell/ev-application.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/shell/ev-application.c b/shell/ev-application.c index aee7390..f669c14 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -75,7 +75,6 @@ ev_application_register_service (EvApplication *application) 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, @@ -83,14 +82,6 @@ ev_application_register_service (EvApplication *application) 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 g_object_unref (driver_proxy); @@ -98,14 +89,8 @@ ev_application_register_service (EvApplication *application) return FALSE; } -#if DBUS_VERSION == 33 - dbus_g_object_class_install_info (G_OBJECT_GET_CLASS (application), - &dbus_glib_ev_application_object_info); -#else dbus_g_object_type_install_info (EV_TYPE_APPLICATION, &dbus_glib_ev_application_object_info); -#endif - dbus_g_connection_register_g_object (connection, "/org/gnome/evince/Evince", G_OBJECT (application)); |