r17901 - in /desktop/experimental/seahorse-plugins/debian: changelog patches/ patches/10_ephyembed_api.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Dec  9 23:52:04 2008
New Revision: 17901

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17901
Log:
* Enable simple-patchsys.
* 10_ephyembed_api.patch: taken from the old seahorse package. 
  Necessary to make the epiphany plugin work.

Added:
    desktop/experimental/seahorse-plugins/debian/patches/
    desktop/experimental/seahorse-plugins/debian/patches/10_ephyembed_api.patch
Modified:
    desktop/experimental/seahorse-plugins/debian/changelog
    desktop/experimental/seahorse-plugins/debian/rules

Modified: desktop/experimental/seahorse-plugins/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse-plugins/debian/changelog?rev=17901&op=diff
==============================================================================
--- desktop/experimental/seahorse-plugins/debian/changelog (original)
+++ desktop/experimental/seahorse-plugins/debian/changelog Tue Dec  9 23:52:04 2008
@@ -17,6 +17,9 @@
     plugins for the correct versions.
   * Depend on seahorse.
   * Deactivate dh_makeshlibs.
+  * Enable simple-patchsys.
+  * 10_ephyembed_api.patch: taken from the old seahorse package. 
+    Necessary to make the epiphany plugin work.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 09 Dec 2008 22:42:45 +0100
 

Added: desktop/experimental/seahorse-plugins/debian/patches/10_ephyembed_api.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse-plugins/debian/patches/10_ephyembed_api.patch?rev=17901&op=file
==============================================================================
--- desktop/experimental/seahorse-plugins/debian/patches/10_ephyembed_api.patch (added)
+++ desktop/experimental/seahorse-plugins/debian/patches/10_ephyembed_api.patch Tue Dec  9 23:52:04 2008
@@ -1,0 +1,30 @@
+diff -pruN seahorse-plugins-2.24.1.orig/plugins/epiphany/mozilla/mozilla-helper.cpp seahorse-plugins-2.24.1/plugins/epiphany/mozilla/mozilla-helper.cpp
+--- seahorse-plugins-2.24.1.orig/plugins/epiphany/mozilla/mozilla-helper.cpp	2008-09-17 00:44:43.000000000 +0200
++++ seahorse-plugins-2.24.1/plugins/epiphany/mozilla/mozilla-helper.cpp	2008-12-10 00:50:22.389715242 +0100
+@@ -78,7 +78,7 @@ extern "C" gboolean
+ mozilla_is_input (EphyEmbed *embed)
+ {
+ 	nsCOMPtr<nsIWebBrowser> browser;
+-	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
++	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
+ 			getter_AddRefs (browser));
+ 	nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
+ 	if (!focus) return FALSE;
+@@ -100,7 +100,7 @@ extern "C" const char*
+ mozilla_get_text (EphyEmbed *embed)
+ {
+     nsCOMPtr<nsIWebBrowser> browser;
+-	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
++	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
+ 			getter_AddRefs (browser));
+ 	nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
+ 	if (!focus) 
+@@ -139,7 +139,7 @@ extern "C" void
+ mozilla_set_text (EphyEmbed *embed, char *new_text)
+ {
+     nsCOMPtr<nsIWebBrowser> browser;
+-	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
++	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
+ 			getter_AddRefs (browser));
+ 	nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
+ 	if (!focus) return;

Modified: desktop/experimental/seahorse-plugins/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse-plugins/debian/rules?rev=17901&op=diff
==============================================================================
--- desktop/experimental/seahorse-plugins/debian/rules (original)
+++ desktop/experimental/seahorse-plugins/debian/rules Tue Dec  9 23:52:04 2008
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk