Merge lp:~abreu-alexandre/unity-chromium-extension/12.10.fix-1138473 into lp:unity-chromium-extension/12.10

[Alexandre Abreu]

Fix #1138473: update the chromium side following the removal of the xid function from libunity-webapps

Fix #1138473: update the chromium side following the removal of the xid function from libunity-webapps

[lp:~abreu-alexandre/unity-chromium-extension/12.10.fix-1138473]

207. By Alexandre Abreu on 2013-03-07

Fix #1138473: update the chromium side following the removal of the xid function from libunity-webapps - forgot files

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-11-14 20:09:35 +0000
+++ configure.ac	2013-03-07 22:12:24 +0000
@@ -14,7 +14,7 @@
 AC_DISABLE_STATIC
 LT_INIT
 
-PKG_CHECK_MODULES(UNITY_NPAPI_PLUGIN, [libunity_webapps-0.2 glib-2.0 libnotify libunity-webapps-repository])
+PKG_CHECK_MODULES(UNITY_NPAPI_PLUGIN, [libunity_webapps-0.2 glib-2.0 libnotify libunity-webapps-repository libwnck-1.0])
 
 
 dnl ***************************************************************************

=== modified file 'npapi-plugin/src/Makefile.am'
--- npapi-plugin/src/Makefile.am	2012-09-07 17:42:51 +0000
+++ npapi-plugin/src/Makefile.am	2013-03-07 22:12:24 +0000
@@ -50,6 +50,8 @@
 	unity-npapi-binding-utils.c \
 	unity-npapi-binding-utils.h \
 	unity-npapi-common.h \
+	unity-npapi-tools.c \
+	unity-npapi-tools.h \
 	unity-npapi-debug.h
 
 libunity_npapi_plugin_la_LDFLAGS = $(UNITY_NPAPI_PLUGIN_COVERAGE_LDFLAGS)

=== added file 'npapi-plugin/src/unity-npapi-tools.c'
--- npapi-plugin/src/unity-npapi-tools.c	1970-01-01 00:00:00 +0000
+++ npapi-plugin/src/unity-npapi-tools.c	2013-03-07 22:12:24 +0000
@@ -0,0 +1,97 @@
+/*
+ * unity-npapi-tools.c
+ * Copyright (C) Canonical LTD 2013
+ * 
+ * Author: Alexandre Abreu <[e-mail]>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <glib.h>
+#include <string.h>
+
+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
+#include <libwnck/libwnck.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#include <unity-webapps-context.h>
+
+#include "unity-npapi-tools.h"
+
+
+void
+unity_npapi_tools_set_xid_for_browser_window_id(UnityWebappsContext *context,
+                                                int window_id)
+{
+  const gchar * const
+    CHROMIUM_LINUX_SESSION_ID_PROPERTY = "CHROMIUM_LINUX_SESSION_ID_PROPERTY";
+
+  WnckScreen *screen;
+  GList *windows, *walk;
+
+  // idempotent
+  gtk_init(NULL, NULL);
+
+  screen = wnck_screen_get_default();
+
+  // TODO find a way to get it from the WnckScreen?
+  GdkDisplay* display = gdk_display_get_default();
+
+  wnck_screen_force_update (screen);
+
+  windows = wnck_screen_get_windows_stacked (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;
+	}
+
+      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])
+	{
+	  unity_webapps_context_set_view_window (context,
+              (guint64) wnck_window_get_xid (window));
+
+	  g_free (session_id);
+	  break;
+	}
+    }
+}
+

=== added file 'npapi-plugin/src/unity-npapi-tools.h'
--- npapi-plugin/src/unity-npapi-tools.h	1970-01-01 00:00:00 +0000
+++ npapi-plugin/src/unity-npapi-tools.h	2013-03-07 22:12:24 +0000
@@ -0,0 +1,30 @@
+/*
+ * unity-npapi-tools.h
+ * Copyright (C) Canonical LTD 2013
+ * 
+ * Author: Alexandre Abreu <[e-mail]>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if ! defined (UNITY_NPAPI_TOOLS_H)
+#define UNITY_NPAPI_TOOLS_H
+
+typedef struct _UnityWebappsContext UnityWebappsContext;
+
+void
+unity_npapi_tools_set_xid_for_browser_window_id(UnityWebappsContext *context,
+                                                int window_id);
+
+#endif // UNITY_NPAPI_TOOLS_H

=== modified file 'npapi-plugin/src/unity-webapps-binding.c'
--- npapi-plugin/src/unity-webapps-binding.c	2012-09-12 16:22:59 +0000
+++ npapi-plugin/src/unity-webapps-binding.c	2013-03-07 22:12:24 +0000
@@ -39,6 +39,7 @@
 #include "unity-npapi-binding-utils.h"
 #include "unity-webapps-scriptable-object.h"
 #include "unity-npapi-plugin.h"
+#include "unity-npapi-tools.h"
 
 NPVariant
 unity_webapps_binding_service_new (NPP instance
@@ -2849,7 +2850,7 @@
   
   REACHED_UNITY_WEBAPPS_FUNC_CALL();
 
-  unity_webapps_service_set_xid_for_browser_window_id (service, context, window_id);
+  unity_npapi_tools_set_xid_for_browser_window_id (context, window_id);
 
   return result;
 }