X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fmain.c;h=3a24e0583796898061569737025e264da5725d41;hb=205c689a78e992d1ad3cf9223f7c95bf424dda94;hp=33cb14ec6446a0a07ceebfe887c65ffe0804c88c;hpb=08f59cdd977b86d17d0a9c70a56b2bfd7f6741a2;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 33cb14ec..3a24e058 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -26,6 +26,8 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtkmain.h>
+#include <stdlib.h>
+#include <string.h>
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-app-helper.h>
@@ -123,7 +125,9 @@ load_files_remote (const char **files)
 	DBusGPendingCall *call;
 #endif
 	DBusGProxy *remote_object;
+#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
 	GdkDisplay *display;
+#endif
 	guint32 timestamp;
 
 #ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
@@ -133,7 +137,7 @@ load_files_remote (const char **files)
 	/* Fake it for GTK+2.6 */
 	timestamp = get_startup_time ();
 #endif
-	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+	connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
 	if (connection == NULL) {
 		g_warning (error->message);
 		g_error_free (error);	
@@ -148,7 +152,7 @@ load_files_remote (const char **files)
 	if (!files) {
 #if DBUS_VERSION <= 33
 		call = dbus_g_proxy_begin_call (remote_object, "OpenWindow",
-						DBUS_TYPE_UINT32, timestamp,
+						DBUS_TYPE_UINT32, &timestamp,
 						DBUS_TYPE_INVALID);
 
 		if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
@@ -189,7 +193,7 @@ load_files_remote (const char **files)
 		call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
 						DBUS_TYPE_STRING, &uri,
 						DBUS_TYPE_STRING, &page_label,
-						DBUS_TYPE_UINT32, timestamp,
+						DBUS_TYPE_UINT32, &timestamp,
 						DBUS_TYPE_INVALID);
 
 		if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {