Merge lp:~ballogy/gloobus-preview/gdbus-port into lp:gloobus-preview

[Balló György]

Port media keys handling to GDBus

This removes the dbus-glib dependency.

=== modified file 'configure.ac'
--- configure.ac	2014-12-25 16:27:26 +0000
+++ configure.ac	2014-12-26 19:18:18 +0000
@@ -54,7 +54,6 @@
 PKG_CHECK_MODULES(GXPS, libgxps)
 PKG_CHECK_MODULES(FREETYPE,freetype2)
 PKG_CHECK_MODULES(GLIB, glib-2.0)
-PKG_CHECK_MODULES(DBUS, dbus-glib-1)
 PKG_CHECK_MODULES(X11, x11)
 
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0)           # To compile XCF loader

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-12-25 16:27:26 +0000
+++ src/Makefile.am	2014-12-26 19:18:18 +0000
@@ -26,7 +26,6 @@
 	$(PTHREAD_CFLAGS) \
 	$(GTKSOURCEVIEW_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(X11_CFLAGS) \
 	$(BOOST_CPPFLAGS)
 
@@ -36,7 +35,6 @@
 	$(GTK_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
 	$(GLIB_LIBS) \
-	$(DBUS_LIBS) \
 	$(X11_LIBS) \
 	-ldl
 

=== modified file 'src/gloobus-preview-interface-media.cpp'
--- src/gloobus-preview-interface-media.cpp	2012-04-06 10:59:53 +0000
+++ src/gloobus-preview-interface-media.cpp	2014-12-26 19:18:18 +0000
@@ -27,17 +27,6 @@
 
 #include "gloobus-preview-interface-media.h"
 
-// GNOME MEDIA KEYS HANDLING ================================================ //
-#include <dbus/dbus-glib.h>
-
-static void dbus_proxy_destroy_cb (DBusGProxy *proxy, gpointer data);
-static void media_key_pressed_cb (DBusGProxy *proxy, const gchar *application, const gchar *key, gpointer data);
-static void media_marshal_VOID__STRING_STRING (GClosure     *closure,
-                                   GValue       *return_value G_GNUC_UNUSED,
-                                   guint         n_param_values,
-                                   const GValue *param_values,
-                                   gpointer      invocation_hint G_GNUC_UNUSED,
-                                   gpointer      marshal_data);
 // ========================================================================== //
 
 iMedia::iMedia( void )
@@ -47,8 +36,11 @@
 	,timeout_id(0)
 	,f_visible(false)
 	,duration(0)
-	,dbus_proxy(0)
-	,focus_in_id(0)
+	,proxy(0)
+	,handler_id(0)
+	,watch_id(0)
+	,cancellable_init(0)
+	,cancellable(0)
 {
 	g_debug("Creating iMedia");
 	activate_media_keys(); //TODO: is it the best place to do it?
@@ -306,139 +298,197 @@
 	((iMedia*)data)->f_visible = false;
 }
 
+static void on_media_player_key_pressed (gpointer     data,
+					 const gchar *key)
+{
+	iMedia *media = (iMedia*)data;
+
+	if (g_strcmp0 ("Play", key) == 0)
+		media->play_pause();
+	else if (g_strcmp0 ("Previous", key) == 0)
+		media->previous();
+	else if (g_strcmp0 ("Next", key) == 0)
+		media->next();
+	else if (g_strcmp0 ("Stop", key) == 0)
+		media->stop();
+}
+
+static void grab_media_player_keys_cb (GDBusProxy                 *proxy,
+				       GAsyncResult               *res,
+				       gpointer                    data)
+{
+	iMedia *media = (iMedia*)data;
+	GVariant *variant;
+	GError *error = NULL;
+
+	variant = g_dbus_proxy_call_finish (proxy, res, &error);
+	media->cancellable = NULL;
+
+	if (variant == NULL) {
+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+			g_warning ("Failed to call \"GrabMediaPlayerKeys\": %s", error->message);
+		g_error_free (error);
+		return;
+	}
+	g_variant_unref (variant);
+}
+
+static void grab_media_player_keys (gpointer                    data)
+{
+	iMedia *media = (iMedia*)data;
+	GCancellable *cancellable;
+
+	if (media->proxy == NULL)
+		return;
+
+	/* Only allow one key grab operation to happen concurrently */
+	if (media->cancellable) {
+		g_cancellable_cancel (media->cancellable);
+	}
+
+	cancellable = g_cancellable_new ();
+	media->cancellable = cancellable;
+
+	g_dbus_proxy_call (media->proxy,
+			   "GrabMediaPlayerKeys",
+			   g_variant_new ("(su)", "Gloobus-Preview", 0),
+			   G_DBUS_CALL_FLAGS_NONE,
+			   -1, cancellable,
+			   (GAsyncReadyCallback) grab_media_player_keys_cb,
+			   data);
+
+	/* GDBus keeps a reference throughout the async call */
+	g_object_unref (cancellable);
+}
+
+static gboolean on_window_focus_in_event (GtkWidget                  *window,
+					  GdkEventFocus              *event,
+					  gpointer                    data)
+{
+	grab_media_player_keys (data);
+
+	return FALSE;
+}
+
+static void key_pressed (GDBusProxy                 *proxy,
+			 gchar                      *sender_name,
+			 gchar                      *signal_name,
+			 GVariant                   *parameters,
+			 gpointer                    data)
+{
+	char *app, *cmd;
+
+	if (g_strcmp0 (signal_name, "MediaPlayerKeyPressed") != 0)
+		return;
+	g_variant_get (parameters, "(ss)", &app, &cmd);
+	if (g_strcmp0 (app, "Gloobus-Preview") == 0) {
+		on_media_player_key_pressed (data, cmd);
+	}
+	g_free (app);
+	g_free (cmd);
+}
+
+static void got_proxy_cb (GObject                    *source_object,
+			  GAsyncResult               *res,
+			  gpointer                    data)
+{
+	iMedia *media = (iMedia*)data;
+	GError *error = NULL;
+
+	media->proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
+	media->cancellable_init = NULL;
+
+	if (media->proxy == NULL) {
+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+			g_warning ("Failed to contact settings daemon: %s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	grab_media_player_keys (data);
+
+	g_signal_connect (G_OBJECT (media->proxy), "g-signal",
+			  G_CALLBACK (key_pressed), data);
+}
+
+static void name_appeared_cb (GDBusConnection            *connection,
+			      const gchar                *name,
+			      const gchar                *name_owner,
+			      gpointer                    data)
+{
+	iMedia *media = (iMedia*)data;
+	GCancellable *cancellable;
+
+	cancellable = g_cancellable_new ();
+	media->cancellable_init = cancellable;
+
+	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+				  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+				  NULL,
+				  "org.gnome.SettingsDaemon",
+				  "/org/gnome/SettingsDaemon/MediaKeys",
+				  "org.gnome.SettingsDaemon.MediaKeys",
+				  cancellable,
+				  (GAsyncReadyCallback) got_proxy_cb,
+				  data);
+
+	/* GDBus keeps a reference throughout the async call */
+	g_object_unref (cancellable);
+}
+
+static void name_vanished_cb (GDBusConnection            *connection,
+			      const gchar                *name,
+			      gpointer                    data)
+{
+	iMedia *media = (iMedia*)data;
+
+	if (media->proxy != NULL) {
+		g_object_unref (media->proxy);
+		media->proxy = NULL;
+	}
+
+	if (media->cancellable) {
+		g_cancellable_cancel (media->cancellable);
+	}
+}
+
 void iMedia::activate_media_keys( void )
 {
-	DBusGConnection *connection;
-	GError *err = NULL;
-	DBusGProxy *proxy;
-
-	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &err);
-	if (connection == NULL) {
-		g_warning ("Error connecting to D-Bus: %s", err->message);
-		return;
-	}
-
-	/* Try the gnome-settings-daemon version,
-	 * then the gnome-control-center version of things */
-	proxy = dbus_g_proxy_new_for_name_owner (connection,
-		"org.gnome.SettingsDaemon",
-		"/org/gnome/SettingsDaemon/MediaKeys",
-		"org.gnome.SettingsDaemon.MediaKeys", NULL);
-	if (proxy == NULL) {
-		proxy = dbus_g_proxy_new_for_name_owner (connection,
-		"org.gnome.SettingsDaemon",
-		"/org/gnome/SettingsDaemon",
-		"org.gnome.SettingsDaemon", &err);
-	}
-
-	dbus_g_connection_unref (connection);
-	
-	if (err != NULL) {
-		g_warning ("Failed to create dbus proxy for org.gnome.SettingsDaemon: %s", err->message);
-		g_error_free (err);
-	} else {
-		dbus_proxy = proxy;
-		//g_signal_connect_object (proxy, "destroy", G_CALLBACK (dbus_proxy_destroy_cb), &dbus_proxy, GConnectFlags(0));
-		g_signal_connect(G_OBJECT(proxy), "destroy", G_CALLBACK (dbus_proxy_destroy_cb), &dbus_proxy);
-	}
-
-	dbus_g_proxy_call (proxy, "GrabMediaPlayerKeys", NULL,
-		G_TYPE_STRING, "Gloobus-Preview", G_TYPE_UINT, 0, G_TYPE_INVALID, G_TYPE_INVALID);
-
-	dbus_g_object_register_marshaller (media_marshal_VOID__STRING_STRING,
-			G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-	dbus_g_proxy_add_signal (proxy, "MediaPlayerKeyPressed",
-			G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal (proxy, "MediaPlayerKeyPressed",
-			G_CALLBACK (media_key_pressed_cb), this, NULL);
-
-	focus_in_id = g_signal_connect (G_OBJECT ( ui->get_window() ),
-		"focus-in-event", G_CALLBACK (focus_in_cb), this);
-
-	dbus_proxy = proxy;
+	watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+				     "org.gnome.SettingsDaemon",
+				     G_BUS_NAME_WATCHER_FLAGS_NONE,
+				     (GBusNameAppearedCallback) name_appeared_cb,
+				     (GBusNameVanishedCallback) name_vanished_cb,
+				     this, NULL);
+
+	handler_id = g_signal_connect (G_OBJECT (ui->get_window()), "focus-in-event",
+				       G_CALLBACK (on_window_focus_in_event), this);
 }
 
 void iMedia::deactivate_media_keys( void )
 {
-	if (dbus_proxy != NULL) {
-		DBusGProxy *proxy = (DBusGProxy*)dbus_proxy;
-		dbus_g_proxy_call (proxy, "ReleaseMediaPlayerKeys", NULL,
-			G_TYPE_STRING, "Gloobus-Preview", G_TYPE_INVALID, G_TYPE_INVALID);
+	if (cancellable_init) {
+		g_cancellable_cancel (cancellable_init);
+	}
+
+	if (cancellable) {
+		g_cancellable_cancel (cancellable);
+	}
+
+	if (proxy != NULL) {
 		g_object_unref (proxy);
-		dbus_proxy = NULL;
-	}
-
-	if (focus_in_id) {
-		g_signal_handler_disconnect (G_OBJECT (ui->get_window()), focus_in_id);
-	}
-}
-
-static void
-dbus_proxy_destroy_cb (DBusGProxy *proxy, gpointer data)
-{
-	DBusGProxy **dbus_proxy = (DBusGProxy**)data;
-	*dbus_proxy = 0;
-}
-
-gboolean iMedia::
-focus_in_cb( GtkWidget *window, GdkEventFocus *event, gpointer data )
-{
-	iMedia *media = (iMedia*)data;
-	if (media->dbus_proxy) {
-		DBusGProxy *proxy = (DBusGProxy*)media->dbus_proxy;
-		dbus_g_proxy_call (proxy, "GrabMediaPlayerKeys", NULL,
-			G_TYPE_STRING, "Gloobus-Preview", G_TYPE_UINT, 0, G_TYPE_INVALID, G_TYPE_INVALID);
-	}
-	return false;
-}
-
-static void
-media_key_pressed_cb (DBusGProxy *proxy,
-					const gchar *application,
-					const gchar *key,
-					gpointer data)
-{
-	iMedia *media = (iMedia*)data;
-	if (g_strcmp0 ("Gloobus-Preview", application) == 0) {
-		if (g_strcmp0 ("Play", key) == 0)
-			media->play_pause();
-		else if (g_strcmp0 ("Previous", key) == 0)
-			media->previous();
-		else if (g_strcmp0 ("Next", key) == 0)
-			media->next();
-		else if (g_strcmp0 ("Stop", key) == 0)
-			media->stop();
-	}
-}
-
-static void
-media_marshal_VOID__STRING_STRING (GClosure     *closure,
-                                   GValue       *return_value G_GNUC_UNUSED,
-                                   guint         n_param_values,
-                                   const GValue *param_values,
-                                   gpointer      invocation_hint G_GNUC_UNUSED,
-                                   gpointer      marshal_data)
-{
-	typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1,
-		gpointer arg_1, gpointer arg_2, gpointer data2);
-	
-	register GMarshalFunc_VOID__STRING_STRING callback;
-	register GCClosure *cc = (GCClosure*) closure;
-	register gpointer data1, data2;
-
-	g_return_if_fail (n_param_values == 3);
-
-	if (G_CCLOSURE_SWAP_DATA (closure)) {
-		data1 = closure->data;
-		data2 = param_values->data[0].v_pointer;
-	} else {
-		data1 = param_values->data[0].v_pointer;
-		data2 = closure->data;
-	}
-	callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
-
-	callback (data1, (param_values+1)->data[0].v_pointer,
-		(param_values+2)->data[0].v_pointer, data2);
+		proxy = NULL;
+	}
+
+	if (handler_id != 0) {
+		g_signal_handler_disconnect (G_OBJECT (ui->get_window()), handler_id);
+		handler_id = 0;
+	}
+
+	if (watch_id != 0) {
+		g_bus_unwatch_name (watch_id);
+		watch_id = 0;
+	}
 }
 
 void iMedia::next( void )

=== modified file 'src/gloobus-preview-interface-media.h'
--- src/gloobus-preview-interface-media.h	2010-08-25 15:08:27 +0000
+++ src/gloobus-preview-interface-media.h	2014-12-26 19:18:18 +0000
@@ -48,9 +48,13 @@
 		bool				f_visible;
 		gint				duration;
 
-		gpointer			dbus_proxy;
-		guint				focus_in_id;
-	
+	public:
+		GDBusProxy 		*	proxy;
+		guint				handler_id;
+		guint				watch_id;
+		GCancellable		*	cancellable_init;
+		GCancellable		*	cancellable;
+
 	public:
 							iMedia					( void );
 		virtual				~iMedia					( void );
@@ -79,7 +83,6 @@
 		virtual	void		update_duration			( gint sec );
 				void		activate_media_keys		( void );
 				void		deactivate_media_keys	( void );
-		static	gboolean	focus_in_cb				( GtkWidget *window, GdkEventFocus *event, gpointer data );
 		static gboolean	    next_file_cb			( gpointer );
 		static gboolean	    previous_file_cb		( gpointer );
 };