Attachment #92593 for bug #130265

View | Details | Raw Unified | Return to bug 130265
Collapse All | Expand All

Lines 6-12 Link Here

(-)google-gadgets/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= google-gadgets	8	PORTNAME= google-gadgets
9	PORTVERSION= 0.10.3	9	PORTVERSION= 0.10.4
10	CATEGORIES= deskutils	10	CATEGORIES= deskutils
11	MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/	11	MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/
12	DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}	12	DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}

Lines 1-3 Link Here

(-)google-gadgets/distinfo (-3 / +3 lines)
1	MD5 (google-gadgets-for-linux-0.10.3.tar.bz2) = 16d2cc4fe05e4416d3b720090237520b	1	MD5 (google-gadgets-for-linux-0.10.4.tar.bz2) = 0ef0a62e0a575388084a77759b646718
2	SHA256 (google-gadgets-for-linux-0.10.3.tar.bz2) = fe63758aacb3842829c5a6d7698152b34becb44fe3e2d84d9706bf4ea9956c1e	2	SHA256 (google-gadgets-for-linux-0.10.4.tar.bz2) = 03ff4140070ae7518a40fef94993c1f32b02d8f65f88f69363447cff501977df
3	SIZE (google-gadgets-for-linux-0.10.3.tar.bz2) = 2310377	3	SIZE (google-gadgets-for-linux-0.10.4.tar.bz2) = 2384725





--- extensions/gtk_system_framework/gtk_system_framework.cc.orig
+++ extensions/gtk_system_framework/gtk_system_framework.cc
@@ -137,7 +137,7 @@
         whole_title.c_str(), NULL, action,
         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
         GTK_STOCK_OK, GTK_RESPONSE_OK,
-        NULL);
+        (gint*)0);
     gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
 
     if (action == GTK_FILE_CHOOSER_ACTION_SAVE) {
     if (filter && *filter) {




--- extensions/gtkmoz_browser_element/Makefile.am.orig
+++ extensions/gtkmoz_browser_element/Makefile.am
@@ -63,8 +63,7 @@
 
 gtkmoz_browser_child_LDADD	= $(GTK2_LIBS) \
 				  $(GTKMOZEMBED_LIBS) \
-				  $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \
-				  -ldl
+				  $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la
 
 gtkmoz_browser_child_LDFLAGS	= $(GTKMOZEMBED_LDFLAGS)
 





--- extensions/gtkmoz_browser_element/browser_element.cc.orig
+++ extensions/gtkmoz_browser_element/browser_element.cc
@@ -157,7 +157,7 @@
       std::string up_fd_str = StringPrintf("%d", up_fds[1]);
       for (size_t i = 0; kBrowserChildNames[i]; ++i) {
         execl(kBrowserChildNames[i], kBrowserChildNames[i],
-              down_fd_str.c_str(), up_fd_str.c_str(), NULL);
+              down_fd_str.c_str(), up_fd_str.c_str(), (char*)0);
       }
       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();
     }
 
     virtual ~BrowserObjectWrapper() {
@@ -426,6 +428,8 @@
         owner_->controller_->SendCommand(kUnrefCommand, owner_->browser_id_,
                                          object_id_str_.c_str(), NULL);
       }
+      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_;

Line 0 Link Here

(-)google-gadgets/files/patch-ggadget_gtk_utilities.cc (+11 lines)
	1	--- ggadget/gtk/utilities.cc.orig 2008-12-03 18:01:36.000000000 +1000
	2	+++ ggadget/gtk/utilities.cc 2009-01-07 00:52:52.000000000 +1000
	3	@@ -83,7 +83,7 @@
	4	"%s", message);
	5	gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_NO, GTK_RESPONSE_NO,
	6	GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
	7	- GTK_STOCK_YES, GTK_RESPONSE_YES, NULL);
	8	+ GTK_STOCK_YES, GTK_RESPONSE_YES, (char *)0);
	9	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
	10	} else {
	11	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,

Lines 119-124 Link Here

(-)google-gadgets/pkg-plist (+1 lines)
119	include/google-gadgets/ggadget/texture.h	119	include/google-gadgets/ggadget/texture.h
120	include/google-gadgets/ggadget/unicode_utils.h	120	include/google-gadgets/ggadget/unicode_utils.h
121	include/google-gadgets/ggadget/usage_collector_interface.h	121	include/google-gadgets/ggadget/usage_collector_interface.h
		122	include/google-gadgets/ggadget/uuid.h
122	include/google-gadgets/ggadget/variant.h	123	include/google-gadgets/ggadget/variant.h
123	include/google-gadgets/ggadget/video_element_base.h	124	include/google-gadgets/ggadget/video_element_base.h
124	include/google-gadgets/ggadget/view.h	125	include/google-gadgets/ggadget/view.h

Return to bug 130265

Lines 3-14 Link Here

(-)google-gadgets/files/patch-extensions_gtk__system__framework_gtk__system__framework.cc (-4 / +4 lines)
3		3
4	--- extensions/gtk_system_framework/gtk_system_framework.cc.orig	4	--- extensions/gtk_system_framework/gtk_system_framework.cc.orig
5	+++ extensions/gtk_system_framework/gtk_system_framework.cc	5	+++ extensions/gtk_system_framework/gtk_system_framework.cc
6	@@ -99,7 +99,7 @@	6	@@ -137,7 +137,7 @@
7	GTK_FILE_CHOOSER_ACTION_OPEN,	7	whole_title.c_str(), NULL, action,
8	GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,	8	GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
9	GTK_STOCK_OK, GTK_RESPONSE_OK,	9	GTK_STOCK_OK, GTK_RESPONSE_OK,
10	- NULL);	10	- NULL);
11	+ (gint*)0);	11	+ (gint*)0);
		12	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
12		13
13	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), multiple);	14	if (action == GTK_FILE_CHOOSER_ACTION_SAVE) {
14	if (filter && *filter) {

Lines 4-15 Link Here

(-)google-gadgets/files/patch-extensions_gtkmoz__browser__element_Makefile.am (-4 / +4 lines)
4	--- extensions/gtkmoz_browser_element/Makefile.am.orig	4	--- extensions/gtkmoz_browser_element/Makefile.am.orig
5	+++ extensions/gtkmoz_browser_element/Makefile.am	5	+++ extensions/gtkmoz_browser_element/Makefile.am
6	@@ -63,8 +63,7 @@	6	@@ -63,8 +63,7 @@
7	gtkmoz_browser_child_LDADD = @GTK2_LIBS@ \	7
8	@GTKMOZEMBED_LIBS@ \	8	gtkmoz_browser_child_LDADD = $(GTK2_LIBS) \
9	$(top_builddir)/ggadget/js/libggadget-js@GGL_EPOCH@.la \	9	$(GTKMOZEMBED_LIBS) \
10	- $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \	10	- $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \
11	- -ldl	11	- -ldl
12	+ $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la	12	+ $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la
13		13
14	gtkmoz_browser_child_LDFLAGS = @GTKMOZEMBED_LDFLAGS@	14	gtkmoz_browser_child_LDFLAGS = $(GTKMOZEMBED_LDFLAGS)
15		15

Lines 3-14 Link Here

(-)google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc (-9 / +47 lines)
3		3
4	--- extensions/gtkmoz_browser_element/browser_element.cc.orig	4	--- extensions/gtkmoz_browser_element/browser_element.cc.orig
5	+++ extensions/gtkmoz_browser_element/browser_element.cc	5	+++ extensions/gtkmoz_browser_element/browser_element.cc
6	@@ -380,7 +380,7 @@	6	@@ -157,7 +157,7 @@
7	for (size_t i = 0; kBrowserChildNames[i]; ++i) {	7	std::string up_fd_str = StringPrintf("%d", up_fds[1]);
8	execl(kBrowserChildNames[i], kBrowserChildNames[i],	8	for (size_t i = 0; kBrowserChildNames[i]; ++i) {
9	down_fd_str.c_str(), up_fd_str.c_str(),	9	execl(kBrowserChildNames[i], kBrowserChildNames[i],
10	- ret_fd_str.c_str(), NULL);	10	- down_fd_str.c_str(), up_fd_str.c_str(), NULL);
11	+ ret_fd_str.c_str(), (char*)0);	11	+ down_fd_str.c_str(), up_fd_str.c_str(), (char*)0);
12	}	12	}
13	LOG("Failed to execute browser child");	13	LOG("Failed to execute browser child");
14	_exit(-1);	14	_exit(-1);
		15	@@ -416,6 +416,8 @@
		16	object_id_str_(StringPrintf("%zu", object_id)),
		17	call_self_(this),
		18	to_string_(NewSlot(this, &BrowserObjectWrapper::ToString)) {
		19	+ if (parent_)
		20	+ parent_->Ref();
		21	}
		22
		23	virtual ~BrowserObjectWrapper() {
		24	@@ -426,6 +428,8 @@
		25	owner_->controller_->SendCommand(kUnrefCommand, owner_->browser_id_,
		26	object_id_str_.c_str(), NULL);
		27	}
		28	+ if (parent_)
		29	+ parent_->Unref();
		30	}
		31
		32	void OnOwnerDestroy() {
		33	@@ -523,8 +527,8 @@
		34	buffer += '\n';
		35	buffer += wrapper_->object_id_str_;
		36	buffer += '\n';
		37	- if (wrapper_->parent_.Get())
		38	- buffer += wrapper_->parent_.Get()->object_id_str_;
		39	+ if (wrapper_->parent_)
		40	+ buffer += wrapper_->parent_->object_id_str_;
		41	for (int i = 0; i < argc; i++) {
		42	buffer += '\n';
		43	buffer += wrapper_->owner_->EncodeValue(argv[i]);
		44	@@ -546,7 +550,7 @@
		45	};
		46
		47	BrowserElementImpl *owner_;
		48	- ScriptableHolder<BrowserObjectWrapper> parent_;
		49	+ BrowserObjectWrapper *parent_;
		50	size_t object_id_;
		51	std::string object_id_str_;
		52	CallSelfSlot call_self_;