Merge lp:~abreu-alexandre/libunity-webapps/2.4-fix-1138473 into lp:libunity-webapps/2.4

[Alexandre Abreu]

Fix #1138473: libunity-webapps pulls gtk 3 in to Firefox

See https://code.launchpad.net/~abreu-alexandre/libunity-webapps/fix-1138473/+merge/151632

[Víctor R. Ruiz (vrruiz)]

Looks ok.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-02-08 17:05:24 +0000
+++ configure.ac	2013-03-05 00:45:25 +0000
@@ -25,18 +25,23 @@
 
 LT_INIT
 
-PKG_CHECK_MODULES(UNITY_WEBAPPS, [gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0
-				 gio-unix-2.0 libwnck-3.0 json-glib-1.0 libsoup-2.4 packagekit-glib2 polkit-gobject-1])
+# Beware: remember that libunity-webapps will be pulled in at runtime in
+# the browser runtime env. So watch out for bad mix ups in the dependancies/runtimes
+# e.g. adding some dependancies on gtk3 when chromium & ff are still gtk2 based.
+PKG_CHECK_MODULES(UNITY_WEBAPPS, [glib-2.0 gobject-2.0 gio-2.0
+				 gio-unix-2.0 json-glib-1.0 libsoup-2.4 packagekit-glib2 polkit-gobject-1])
 GLIB_GSETTINGS
 
 PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib])
-PKG_CHECK_MODULES(UNITY_WEBAPPS_DAEMON, [libnotify unity messaging-menu gtk+-3.0 sqlite3])
+PKG_CHECK_MODULES(UNITY_WEBAPPS_DAEMON, [libnotify unity messaging-menu gtk+-3.0 sqlite3 gdk-pixbuf-2.0 libwnck-3.0])
 
 PKG_CHECK_MODULES(UNITY_WEBAPPS_WM_PID_TRACKER, [libwnck-3.0])
 PKG_CHECK_MODULES(GEOCLUE, [geoclue])
 
 PKG_CHECK_MODULES(UNITY_WEBAPPS_SERVICE_TRACKER, [gtk+-3.0 dbusmenu-glib-0.4 dbusmenu-gtk3-0.4])
 
+PKG_CHECK_MODULES(UNITY_WEBAPPS_TOOLS, [libwnck-3.0])
+
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen], AC_MSG_ERROR([gdbus-codegen is required but was not found]))

=== modified file 'src/libunity-webapps/unity-webapps-service.c'
--- src/libunity-webapps/unity-webapps-service.c	2012-09-25 21:58:07 +0000
+++ src/libunity-webapps/unity-webapps-service.c	2013-03-05 00:45:25 +0000
@@ -24,13 +24,8 @@
  *
  * Client bindings for the Unity Webapps Service daemon.
  */
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <stdio.h>
 
-#include <libwnck/libwnck.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
 #include <unistd.h>
 
 #include "unity-webapps-service.h"
@@ -41,8 +36,6 @@
 struct _UnityWebappsServicePrivate {
   GDBusConnection *connection;
   UnityWebappsGenService *service_proxy;
-  
-  WnckScreen *screen;
 };
 
 G_DEFINE_TYPE(UnityWebappsService, unity_webapps_service, G_TYPE_OBJECT)
@@ -109,9 +102,6 @@
       
       return;
     }
-  
-  service->priv->screen = wnck_screen_get_default ();
-  
 }
 
 /**
@@ -125,7 +115,6 @@
 UnityWebappsService *
 unity_webapps_service_new ()
 {
-  gtk_init (NULL, NULL);
   return g_object_new (UNITY_WEBAPPS_TYPE_SERVICE, NULL);
 }
 
@@ -347,78 +336,16 @@
 #include "unity-webapps-context.h" 
 
 /**
- * A proper chromium browser window instance will have a specific property reflecting
- *  its window_id (or session id in chromium). The window_id is accessible
- *  (implicitly) from js and therefore can/is being used as a way to associate
- *  a context to a proper browser window it is being displayed in.
- * 
- * Here we just list the existing windows searching for this property and its value.
+ * WARNING: this is only kept part of the "ABI"
+ * so that ufe still works (jsctypes still tried to bind with it).
+ * Should be removed ASAP ufe is released.
  */
 void
 unity_webapps_service_set_xid_for_browser_window_id (UnityWebappsService *service,
 						     UnityWebappsContext *context,
 						     int window_id)
 {
-  const gchar * const
-    CHROMIUM_LINUX_SESSION_ID_PROPERTY = "CHROMIUM_LINUX_SESSION_ID_PROPERTY";
-  
-  GList *windows, *walk;
-  
-  // TODO find a way to get it from the WnckScreen?
-  GdkDisplay* display = gdk_display_get_default();
-  
-  wnck_screen_force_update (service->priv->screen);
-  
-  windows = wnck_screen_get_windows_stacked (service->priv->screen);
-  
-  for (walk = windows; walk != NULL; walk = walk->next)
-    {
-      WnckWindow *window = WNCK_WINDOW (walk->data);
-
-      GdkWindow*
-	  active_window = gdk_x11_window_foreign_new_for_display (display,
-								  wnck_window_get_xid(window));
-      
-      if (NULL == active_window)
-	{
-	  g_message ("Could not retrieve GdkWindow for xid %ld", wnck_window_get_xid(window));
-	  continue;
-	}
-      
-      g_message ("Checking window name %s",
-		 wnck_window_has_name(window)
-		  ? wnck_window_get_name(window)
- 		  : "Uknown");
-      
-      GdkAtom atom;
-      gint format = 0;
-      gint out_length = 0;
-      gint * session_id = NULL;
-      gboolean
-	have_prop = gdk_property_get (active_window,
-		        gdk_atom_intern(CHROMIUM_LINUX_SESSION_ID_PROPERTY,
-                                        FALSE),
-			gdk_atom_intern("CARDINAL", FALSE),
-			0L,
-			4,
-			FALSE,
-			&atom,
-			&format,
-			&out_length,
-			(guchar **)&session_id);
-      if (TRUE == have_prop && NULL != session_id && window_id == session_id[0])
-	{
-	  g_message ("Found chromium window w/ session id property %d",
-		     session_id[0]);
-	  
-	  unity_webapps_context_set_view_window (context,
-                                                 (guint64) wnck_window_get_xid (window));
-	  
-	  g_free (session_id);
-	  
-	  break;
-	}
-    }
+  g_warning("unity_webapps_service_set_xid_for_browser_window_id: called but empty");
 }
 
 void 

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2012-09-04 20:50:20 +0000
+++ tools/Makefile.am	2013-03-05 00:45:25 +0000
@@ -3,6 +3,7 @@
 	$(UNITY_WEBAPPS_WM_PID_TRACKER_CFLAGS) \
 	$(UNITY_WEBAPPS_SERVICE_TRACKER_CFLAGS) \
 	$(UNITY_WEBAPPS_DEBUG_CFLAGS) \
+	$(UNITY_WEBAPPS_TOOLS_CFLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/libunity-webapps \
 	-I$(top_srcdir)/src/context-daemon \
@@ -47,6 +48,7 @@
 service_tracker_LDADD = \
 	$(UNITY_WEBAPPS_LIBS) \
 	$(UNITY_WEBAPPS_SERVICE_TRACKER_LIBS) \
+	$(UNITY_WEBAPPS_TOOLS_LIBS) \
 	$(top_builddir)/src/libunity-webapps/libunity-webapps.la
 
 webapps_spreader_SOURCES = \
@@ -55,6 +57,7 @@
 webapps_spreader_LDADD = \
 	$(UNITY_WEBAPPS_LIBS) \
 	$(UNITY_WEBAPPS_SERVICE_TRACKER_LIBS) \
+	$(UNITY_WEBAPPS_TOOLS_LIBS) \
 	$(top_builddir)/src/libunity-webapps/libunity-webapps.la
 
 unity_webapps_installer_SOURCES = \