Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/deskutils/google-gadgets/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	23 Jan 2009 15:42:39 -0000	1.10
+++ Makefile	4 Mar 2009 21:30:47 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	google-gadgets
-PORTVERSION=	0.10.4
-PORTREVISION=	1
+PORTVERSION=	0.10.5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
 DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}
@@ -64,7 +63,7 @@
 .elif defined(WITH_GTK)
 USE_GNOME=	gtk20
 PLIST_SUB+=	GTK=""
-CONFIGURE_ARGS+=	--enable-gtk-host
+CONFIGURE_ARGS+=	--enable-gtk-host --with-gtkmozembed=firefox
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libstartup-notification-1.0.pc:${PORTSDIR}/x11/startup-notification
 LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 .endif
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/deskutils/google-gadgets/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	15 Jan 2009 12:11:24 -0000	1.6
+++ distinfo	3 Mar 2009 22:17:53 -0000
@@ -1,3 +1,3 @@
-MD5 (google-gadgets-for-linux-0.10.4.tar.bz2) = 0ef0a62e0a575388084a77759b646718
-SHA256 (google-gadgets-for-linux-0.10.4.tar.bz2) = 03ff4140070ae7518a40fef94993c1f32b02d8f65f88f69363447cff501977df
-SIZE (google-gadgets-for-linux-0.10.4.tar.bz2) = 2384725
+MD5 (google-gadgets-for-linux-0.10.5.tar.bz2) = fdad6bd761b6c603e457b5d0d92ec2f9
+SHA256 (google-gadgets-for-linux-0.10.5.tar.bz2) = 944810df4b134542a1e675e6d9518503466ce9398e8bfca5e3637d994ef5038d
+SIZE (google-gadgets-for-linux-0.10.5.tar.bz2) = 2429875
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/deskutils/google-gadgets/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist	15 Jan 2009 12:11:24 -0000	1.7
+++ pkg-plist	3 Mar 2009 22:17:53 -0000
@@ -258,10 +258,10 @@
 @dirrm lib/google-gadgets/include/ggadget
 @dirrm lib/google-gadgets/include
 @dirrm lib/google-gadgets
+@dirrm include/google-gadgets/ggadget/xdg
 %%QT%%@dirrm include/google-gadgets/ggadget/qt
-@dirrm include/google-gadgets/ggadget/js
 @dirrm include/google-gadgets/ggadget/npapi
-@dirrm include/google-gadgets/ggadget/xdg
+@dirrm include/google-gadgets/ggadget/js
 %%GTK%%@dirrm include/google-gadgets/ggadget/gtk
 @dirrm include/google-gadgets/ggadget/dbus
 @dirrm include/google-gadgets/ggadget
Index: files/patch-extensions_gtkmoz__browser__element_browser__element.cc
===================================================================
RCS file: /home/pcvs/ports/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc,v
retrieving revision 1.2
diff -u -r1.2 patch-extensions_gtkmoz__browser__element_browser__element.cc
--- files/patch-extensions_gtkmoz__browser__element_browser__element.cc	15 Jan 2009 12:11:25 -0000	1.2
+++ files/patch-extensions_gtkmoz__browser__element_browser__element.cc	4 Mar 2009 21:06:58 -0000
@@ -1,9 +1,9 @@
 
 $FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc,v 1.2 2009/01/15 12:11:25 miwi Exp $
 
---- extensions/gtkmoz_browser_element/browser_element.cc.orig
-+++ extensions/gtkmoz_browser_element/browser_element.cc
-@@ -157,7 +157,7 @@
+--- extensions/gtkmoz_browser_element/browser_element.cc.orig	2009-01-05 04:09:47.000000000 +0100
++++ extensions/gtkmoz_browser_element/browser_element.cc	2009-03-04 22:01:31.000000000 +0100
+@@ -164,7 +164,7 @@
        std::string up_fd_str = StringPrintf("%d", up_fds[1]);
        for (size_t i = 0; kBrowserChildNames[i]; ++i) {
          execl(kBrowserChildNames[i], kBrowserChildNames[i],
@@ -12,41 +12,12 @@
        }
        LOG("Failed to execute browser child");
        _exit(-1);
-@@ -416,6 +416,8 @@
-           object_id_str_(StringPrintf("%zu", object_id)),
-           call_self_(this),
-           to_string_(NewSlot(this, &BrowserObjectWrapper::ToString)) {
-+      if (parent_)
-+        parent_->Ref();
-     }
+@@ -297,6 +297,8 @@
  
-     virtual ~BrowserObjectWrapper() {
-@@ -426,6 +428,8 @@
-         owner_->controller_->SendCommand(kUnrefCommand, owner_->browser_id_,
-                                          object_id_str_.c_str(), NULL);
+         ProcessFeedback(param_count, params);
        }
 +      if (parent_)
 +        parent_->Unref();
      }
- 
-     void OnOwnerDestroy() {
-@@ -523,8 +527,8 @@
-         buffer += '\n';
-         buffer += wrapper_->object_id_str_;
-         buffer += '\n';
--        if (wrapper_->parent_.Get())
--          buffer += wrapper_->parent_.Get()->object_id_str_;
-+        if (wrapper_->parent_)
-+          buffer += wrapper_->parent_->object_id_str_;
-         for (int i = 0; i < argc; i++) {
-           buffer += '\n';
-           buffer += wrapper_->owner_->EncodeValue(argv[i]);
-@@ -546,7 +550,7 @@
-     };
- 
-     BrowserElementImpl *owner_;
--    ScriptableHolder<BrowserObjectWrapper> parent_;
-+    BrowserObjectWrapper *parent_;
-     size_t object_id_;
-     std::string object_id_str_;
-     CallSelfSlot call_self_;
+     return reply;
+   }