rpms/galeon/devel galeon-2.0.7-warnings.patch, NONE, 1.1 galeon.spec, 1.54, 1.55

Denis Leroy denis at fedoraproject.org
Tue Oct 7 09:11:48 UTC 2008 

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22491

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-warnings.patch 
Log Message:
Added warnings fix patch

galeon-2.0.7-warnings.patch:

--- NEW FILE galeon-2.0.7-warnings.patch ---
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-context-menu.c galeon-2.0.7/bookmarks/bookmarks-context-menu.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-context-menu.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-context-menu.c	2008-10-07 10:23:42.000000000 +0200
@@ -236,7 +236,7 @@
 
 	p->menu = gtk_menu_new ();
 	g_object_ref (p->menu);
-	gtk_object_sink (GTK_OBJECT (p->menu));
+	g_object_ref_sink (p->menu);
 
 	if (GB_IS_SITE (p->bm))
 	{
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-editor.c galeon-2.0.7/bookmarks/bookmarks-editor.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-editor.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-editor.c	2008-10-07 10:23:42.000000000 +0200
@@ -524,7 +524,7 @@
 
 		gtk_widget_show (GTK_WIDGET (p->left_tree_view));
 		g_object_ref (p->left_tree_view);
-		gtk_object_sink (GTK_OBJECT (p->left_tree_view));
+		g_object_ref_sink (p->left_tree_view);
 
 		p->right_tree_view = gb_tree_view_new ();
 		if (p->location_source)
@@ -540,7 +540,7 @@
 		
 		gtk_widget_show (GTK_WIDGET (p->right_tree_view));
 		g_object_ref (p->right_tree_view);
-		gtk_object_sink (GTK_OBJECT (p->right_tree_view));
+		g_object_ref_sink (p->right_tree_view);
 
 		gb_tree_view_set_autoexpand_roots (p->right_tree_view, FALSE);
 	}
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-menu-item.c galeon-2.0.7/bookmarks/bookmarks-gtk-menu-item.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-menu-item.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-gtk-menu-item.c	2008-10-07 10:23:42.000000000 +0200
@@ -82,7 +82,6 @@
 	GB_GTK_MENU_ITEM_LAST_SIGNAL
 };
 static gint GbGtkMenuItemSignals[GB_GTK_MENU_ITEM_LAST_SIGNAL];
-static GtkTooltips *_gb_gtk_menu_item_tooltips = NULL;
 
 /**
  * GtkMenu object
@@ -115,14 +114,6 @@
 	GbGtkMenuItemPrivate *p = GB_GTK_MENU_ITEM_GET_PRIVATE (m);
 	m->priv = p;
 
-	if (!_gb_gtk_menu_item_tooltips)
-	{
-		_gb_gtk_menu_item_tooltips = gtk_tooltips_new ();
-		g_object_add_weak_pointer (G_OBJECT (_gb_gtk_menu_item_tooltips),
-					   (gpointer)&_gb_gtk_menu_item_tooltips);
-	}
-	g_object_ref (_gb_gtk_menu_item_tooltips);
-	gtk_object_sink (GTK_OBJECT(_gb_gtk_menu_item_tooltips));
 }
 
 static void
@@ -153,8 +144,6 @@
 
 	g_object_unref (G_OBJECT (p->bookmark));
 
-	g_object_unref (_gb_gtk_menu_item_tooltips);
-
 	G_OBJECT_CLASS (gb_gtk_menu_item_parent_class)->finalize (o);
 }
 
@@ -228,9 +217,7 @@
 		char *tooltip;
 
 		tooltip = g_strjoinv("\n\n", parts);
-		gtk_tooltips_set_tip (_gb_gtk_menu_item_tooltips,
-				      GTK_WIDGET(bmi),
-				      tooltip, NULL);
+		gtk_widget_set_tooltip_text (GTK_WIDGET(bmi), tooltip);
 		g_free (tooltip);
 	}
 }
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar.c galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar.c	2008-10-07 10:23:42.000000000 +0200
@@ -247,7 +247,7 @@
 		 * feedback */
 		toolbar->priv->drag_item = gtk_tool_button_new (NULL, "m");
 		g_object_ref (G_OBJECT (toolbar->priv->drag_item));
-		gtk_object_sink (GTK_OBJECT (toolbar->priv->drag_item));
+		g_object_ref_sink (toolbar->priv->drag_item);
 	}
   
 	gdk_drag_status (context, context->suggested_action, time);
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar-set.c galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar-set.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar-set.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar-set.c	2008-10-07 10:23:42.000000000 +0200
@@ -228,7 +228,7 @@
 	
 	gtk_widget_show (GTK_WIDGET (tb));
 	g_hash_table_insert (p->folder_to_toolbar, g_object_ref (f), g_object_ref (tb));
-	gtk_object_sink (GTK_OBJECT (tb));
+	g_object_ref_sink (tb);
 	
 	if (p->add_func)
 	{
diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-icon-provider.c galeon-2.0.7/bookmarks/bookmarks-icon-provider.c
--- galeon-2.0.7.orig/bookmarks/bookmarks-icon-provider.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/bookmarks/bookmarks-icon-provider.c	2008-10-07 10:23:42.000000000 +0200
@@ -209,7 +209,7 @@
 	GtkWidget *dummy = gtk_toolbar_new ();
 
 	g_object_ref (dummy);
-	gtk_object_sink (GTK_OBJECT (dummy));
+	g_object_ref_sink (dummy);
 
 	if (p->folder_pixbuf_data)
 	{
diff -ur galeon-2.0.7.orig/configure.in galeon-2.0.7/configure.in
--- galeon-2.0.7.orig/configure.in	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/configure.in	2008-10-07 10:23:42.000000000 +0200
@@ -367,9 +367,9 @@
 #CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS $GALEON_DEPENDENCY_CFLAGS"
 #CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS"
 #LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS $MOZILLA_COMPONENT_LIBS"
-CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` $GALEON_DEPENDENCY_CFLAGS"
-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
-LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom`"
+CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA_XPCOM` $GALEON_DEPENDENCY_CFLAGS"
+CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA_XPCOM`"
+LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA_XPCOM`"
 
 
 TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
diff -ur galeon-2.0.7.orig/embed/galeon-embed-shell.c galeon-2.0.7/embed/galeon-embed-shell.c
--- galeon-2.0.7.orig/embed/galeon-embed-shell.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/embed/galeon-embed-shell.c	2008-10-07 10:23:42.000000000 +0200
@@ -321,7 +321,7 @@
 	{
 		shell->priv->js_console = GALEON_JS_CONSOLE (galeon_js_console_new ());
 		g_object_ref (shell->priv->js_console);
-		gtk_object_sink (GTK_OBJECT (shell->priv->js_console));
+		g_object_ref_sink (shell->priv->js_console);
 	}
 	
 	return shell->priv->js_console;
diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-item.c galeon-2.0.7/libegg/dock/egg-dock-item.c
--- galeon-2.0.7.orig/libegg/dock/egg-dock-item.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/libegg/dock/egg-dock-item.c	2008-10-07 10:23:42.000000000 +0200
@@ -1154,7 +1154,7 @@
         {
             GEnumClass *enum_class = G_ENUM_CLASS (g_type_class_ref (EGG_TYPE_DOCK_PLACEMENT));
             GEnumValue *enum_value = g_enum_get_value (enum_class, position);
-            gchar *name = enum_value ? enum_value->value_name : NULL;
+            const gchar *name = enum_value ? enum_value->value_name : NULL;
             
             g_warning (("Unsupported docking strategy %s in dock object of type %s"),
                        name,  G_OBJECT_TYPE_NAME (object));
@@ -1485,13 +1485,13 @@
                                                   NULL, item);
             g_object_set (item->_priv->tab_label, "item", NULL, NULL);
         }
-        gtk_widget_unref (item->_priv->tab_label);
+        g_object_unref (item->_priv->tab_label);
         item->_priv->tab_label = NULL;
     }
     
     if (tablabel) {
-        gtk_widget_ref (tablabel);
-        gtk_object_sink (GTK_OBJECT (tablabel));
+        g_object_ref (tablabel);
+        g_object_ref_sink (tablabel);
         item->_priv->tab_label = tablabel;
         if (EGG_IS_DOCK_TABLABEL (tablabel)) {
             g_object_set (tablabel, "item", item, NULL);
@@ -1564,7 +1564,7 @@
                           "host", item,
                           NULL));
         g_object_ref (item->_priv->ph);
-        gtk_object_sink (GTK_OBJECT (item->_priv->ph));
+        g_object_ref_sink (item->_priv->ph);
     }
     
     egg_dock_object_freeze (EGG_DOCK_OBJECT (item));
@@ -1627,7 +1627,7 @@
     if (reference && EGG_DOCK_OBJECT_ATTACHED (reference)) {
         if (EGG_IS_DOCK_PLACEHOLDER (reference)) {
             g_object_ref (reference);
-            gtk_object_sink (GTK_OBJECT (reference));
+            g_object_ref_sink (reference);
             item->_priv->ph = EGG_DOCK_PLACEHOLDER (reference);
         }
         else {
@@ -1637,7 +1637,7 @@
                               "host", reference,
                               NULL));
             g_object_ref (item->_priv->ph);
-            gtk_object_sink (GTK_OBJECT (item->_priv->ph));
+            g_object_ref_sink (item->_priv->ph);
         }
     }
 }
diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-master.c galeon-2.0.7/libegg/dock/egg-dock-master.c
--- galeon-2.0.7.orig/libegg/dock/egg-dock-master.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/libegg/dock/egg-dock-master.c	2008-10-07 10:23:42.000000000 +0200
@@ -736,7 +736,7 @@
         }
         else {
             g_object_ref (object);
-            gtk_object_sink (GTK_OBJECT (object));
+            g_object_ref_sink (object);
             g_hash_table_insert (master->dock_objects, g_strdup (object->name), object);
         }
     }
diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-object.c galeon-2.0.7/libegg/dock/egg-dock-object.c
--- galeon-2.0.7.orig/libegg/dock/egg-dock-object.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/libegg/dock/egg-dock-object.c	2008-10-07 10:23:42.000000000 +0200
@@ -28,6 +28,7 @@
 #include <egg-macros.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gtk/gtkobject.h>
 
 #include "egg-dock-object.h"
 #include "egg-dock-master.h"
@@ -388,7 +389,7 @@
             g_object_unref (child);
         }
         /* sink the widget, so any automatic floating widget is destroyed */
-        gtk_object_sink (GTK_OBJECT (object));
+        g_object_ref_sink (object);
         /* don't reenter */
         object->reduce_pending = FALSE;
         egg_dock_object_thaw (object);
diff -ur galeon-2.0.7.orig/libegg/egg-editable-toolbar.c galeon-2.0.7/libegg/egg-editable-toolbar.c
--- galeon-2.0.7.orig/libegg/egg-editable-toolbar.c	2008-10-07 10:22:44.000000000 +0200
+++ galeon-2.0.7/libegg/egg-editable-toolbar.c	2008-10-07 10:23:42.000000000 +0200
@@ -476,7 +476,7 @@
         create_item_from_action (etoolbar, id, type,
 				 data_is_separator (id), NULL);
       g_object_ref (etoolbar->priv->dragged_item);
-      gtk_object_sink (GTK_OBJECT (etoolbar->priv->dragged_item));
+      g_object_ref_sink (etoolbar->priv->dragged_item);
     }
   else
     {
@@ -1278,7 +1278,7 @@
       toolbar->priv->fixed_toolbar = gtk_toolbar_new ();
       gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar->priv->fixed_toolbar), FALSE);
       g_object_ref (toolbar->priv->fixed_toolbar);
-      gtk_object_sink (GTK_OBJECT (toolbar->priv->fixed_toolbar));
+      g_object_ref_sink (toolbar->priv->fixed_toolbar);
     }
 
   if (toolbar->priv->fixed)
@@ -1293,7 +1293,7 @@
   if (fixed)
     {
       g_object_ref (fixed);
-      gtk_object_sink (GTK_OBJECT (fixed));
+      g_object_ref_sink (fixed);
 
       gtk_toolbar_insert (GTK_TOOLBAR (toolbar->priv->fixed_toolbar), fixed, 0);
     }
diff -ur galeon-2.0.7.orig/mozilla/EphyPromptService.cpp galeon-2.0.7/mozilla/EphyPromptService.cpp
--- galeon-2.0.7.orig/mozilla/EphyPromptService.cpp	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/EphyPromptService.cpp	2008-10-07 10:23:42.000000000 +0200
@@ -146,7 +146,7 @@
 
 	mDialog = GTK_DIALOG (gtk_dialog_new ());
 	g_object_ref (mDialog);
-	gtk_object_sink (GTK_OBJECT (mDialog));
+	g_object_ref_sink (mDialog);
 
 	char *title = NULL;
 	if (aTitle)
diff -ur galeon-2.0.7.orig/mozilla/HeaderSniffer.cpp galeon-2.0.7/mozilla/HeaderSniffer.cpp
--- galeon-2.0.7.orig/mozilla/HeaderSniffer.cpp	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/HeaderSniffer.cpp	2008-10-07 10:23:42.000000000 +0200
@@ -586,11 +586,12 @@
 
 	if (mDocument && (flags & EMBED_PERSIST_SAVE_CONTENT))
 	{
-		GtkWidget *toggle;
-
 		/* Reset the flags to turn off content, the user toggles
 		 * if they want to turn it on */
-		(gint&)flags &= ~EMBED_PERSIST_SAVE_CONTENT;
+		GtkWidget *toggle;
+                int f = flags & ~EMBED_PERSIST_SAVE_CONTENT;
+                flags = (EmbedPersistFlags) f;
+
 		galeon_embed_persist_set_flags (mEmbedPersist, flags);
 
 		toggle = gtk_check_button_new_with_mnemonic (_("Save _with content"));
diff -ur galeon-2.0.7.orig/mozilla/mozilla-embed-shell.cpp galeon-2.0.7/mozilla/mozilla-embed-shell.cpp
--- galeon-2.0.7.orig/mozilla/mozilla-embed-shell.cpp	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2008-10-07 10:23:42.000000000 +0200
@@ -21,9 +21,21 @@
 #endif
 
 #include <nscore.h>
+
+/* Some versions of nscore.h appears to #define nscore_h___, while
+ * gtkmozembed.h looks for nscore_h__ to see if stuff needs
+ * redefining (what were they thinking?!).  Define explicitly, then
+ * curse. */
+#ifndef nscore_h__
+#define nscore_h__
+#endif
+
 #include <nsComponentManagerUtils.h>
 #include <nsServiceManagerUtils.h>
 
+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
+#define HAVE_VISIBILITY_ATTRIBUTE 1
+
 #ifdef XPCOM_GLUE
 #include <nsXPCOMGlue.h>
 #include <gtkmozembed_glue.cpp>
diff -ur galeon-2.0.7.orig/mozilla/mozilla-notifiers.cpp galeon-2.0.7/mozilla/mozilla-notifiers.cpp
--- galeon-2.0.7.orig/mozilla/mozilla-notifiers.cpp	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-notifiers.cpp	2008-10-07 10:23:42.000000000 +0200
@@ -131,7 +131,7 @@
 
 static const struct 
 {
-	char *gconf_key;
+	const char *gconf_key;
 	guint pref_type;
 	const char *mozilla_key;
 }
@@ -369,7 +369,7 @@
 	for (i = 0; i < num_font_languages; i++)
 	{
 		int k;
-		char *types [] = { "serif", "sans-serif", "cursive", "fantasy", "monospace" };
+		const char *types [] = { "serif", "sans-serif", "cursive", "fantasy", "monospace" };
 		char key[255];
 		char *info;
 		const char* language = font_languages[i].key;
@@ -614,7 +614,7 @@
 	g_slist_free(language_list);
 }
 
-static char *autodetect_charset_prefs[] =
+static const char *autodetect_charset_prefs[] =
 {
         "",
         "zh_parallel_state_machine",
diff -ur galeon-2.0.7.orig/mozilla/ProgressListener.h galeon-2.0.7/mozilla/ProgressListener.h
--- galeon-2.0.7.orig/mozilla/ProgressListener.h	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/mozilla/ProgressListener.h	2008-10-07 10:23:42.000000000 +0200
@@ -60,7 +60,7 @@
 #define G_PROGRESSDIALOG_CLASSNAME "Galeon's Download Progress Dialog"
 #define G_PROGRESSDIALOG_CONTRACTID "@mozilla.org/progressdialog;1"
 
-class GProgressListener : 
+class NS_COM_GLUE GProgressListener : 
 			  public nsITransfer,
  			  public nsSupportsWeakReference
 {
diff -ur galeon-2.0.7.orig/utils/galeon-sidebar.c galeon-2.0.7/utils/galeon-sidebar.c
--- galeon-2.0.7.orig/utils/galeon-sidebar.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/utils/galeon-sidebar.c	2008-10-07 10:23:42.000000000 +0200
@@ -304,7 +304,7 @@
 
         sidebar->priv->title_menu = gtk_menu_new ();
         g_object_ref (sidebar->priv->title_menu);
-        gtk_object_sink (GTK_OBJECT (sidebar->priv->title_menu));
+        g_object_ref_sink (sidebar->priv->title_menu);
         gtk_widget_show (sidebar->priv->title_button);
         gtk_widget_show (sidebar->priv->title_menu);
 
diff -ur galeon-2.0.7.orig/utils/gul-download.c galeon-2.0.7/utils/gul-download.c
--- galeon-2.0.7.orig/utils/gul-download.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/utils/gul-download.c	2008-10-07 10:23:42.000000000 +0200
@@ -65,7 +65,12 @@
 		gchar *dirName, *utf8DirName, *prefDir = NULL;
 		gsize bytesRead, bytesWritten;
 		gint retVal;
-		GtkWidget *fileSel = gtk_file_selection_new(_("Choose destination folder"));
+		GtkWidget *fileSel =
+                    gtk_file_chooser_dialog_new(_("Choose destination folder"),
+                                                NULL,
+                                                GTK_FILE_CHOOSER_ACTION_SAVE,
+                                                NULL,
+                                                NULL);
 
 		/* Dirname must end in a '/' for the file selection to treat
 		 * it as a directory. When we have a UI to set the value, we
@@ -96,10 +101,9 @@
 			return;
 		}
 
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileSel),
-						dirName);
-		gtk_widget_set_sensitive(GTK_FILE_SELECTION(fileSel)
-					 ->file_list, FALSE);
+		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(fileSel),
+                                              dirName);
+		gtk_widget_set_sensitive(fileSel, FALSE);
 
 		retVal = gtk_dialog_run(GTK_DIALOG(fileSel));
 
@@ -109,7 +113,7 @@
 			 * which is what we need.
 			 */
 			gul_download_save_url_with_dir(url,
-				gtk_file_selection_get_filename(GTK_FILE_SELECTION(fileSel)));
+				gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fileSel)));
 		}
 		gtk_widget_hide(fileSel);
 		gtk_widget_destroy(fileSel);
diff -ur galeon-2.0.7.orig/utils/gul-notebook.c galeon-2.0.7/utils/gul-notebook.c
--- galeon-2.0.7.orig/utils/gul-notebook.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/utils/gul-notebook.c	2008-10-07 10:23:42.000000000 +0200
@@ -77,7 +77,6 @@
 /* Local variables */
 static GdkCursor *cursor = NULL;
 static GList *notebooks  = NULL;
-static GtkTooltips *_gul_notebook_tooltips = NULL;
 
 
 /* Local functions */
@@ -662,15 +661,6 @@
 static void
 gul_notebook_init (GulNotebook *notebook)
 {
-	if (!_gul_notebook_tooltips)
-	{
-		_gul_notebook_tooltips = gtk_tooltips_new ();
-		g_object_add_weak_pointer (G_OBJECT (_gul_notebook_tooltips),
-					   (gpointer)&_gul_notebook_tooltips);
-	}
-	g_object_ref (_gul_notebook_tooltips);
-	gtk_object_sink (GTK_OBJECT (_gul_notebook_tooltips));
-
 	notebook->priv = g_new (GulNotebookPrivate, 1);
 
 	notebook->priv->drag_in_progress = FALSE;
@@ -706,8 +696,6 @@
 
 	g_free (notebook->priv);
 
-	g_object_unref (_gul_notebook_tooltips);
-
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -794,7 +782,7 @@
 	rcstyle = gtk_rc_style_new ();
 	rcstyle->xthickness = rcstyle->ythickness = 0;
 	gtk_widget_modify_style (close_button, rcstyle);
-	gtk_rc_style_unref (rcstyle),
+	g_object_unref (rcstyle),
 
 	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
 					  GTK_ICON_SIZE_MENU);
@@ -802,8 +790,7 @@
 	gtk_widget_set_size_request (close_button, size.width, size.height);
 	gtk_container_add (GTK_CONTAINER (close_button), image);
 
-	gtk_tooltips_set_tip (_gul_notebook_tooltips, close_button,
-			      _("Close this tab"), NULL);
+	gtk_widget_set_tooltip_text (close_button, _("Close this tab"));
 
 	/* setup label, need eventbox for tooltips and left-padding to get
 	 * comfortable space between the label and icon/tab border */
@@ -997,7 +984,7 @@
  	/* remove the tool tip for this ebox */
  	label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (nb), child);
  	ebox = GTK_WIDGET (g_object_get_data (G_OBJECT (label), "label-ebox"));
- 	gtk_tooltips_set_tip (_gul_notebook_tooltips, ebox, NULL, NULL);
+ 	gtk_widget_set_tooltip_text (ebox, NULL);
  
 	/* If we don't clear the icon then for some reason it gets reset back
 	 * to an empty icon. This means that although gul_notebook_move_page() has
@@ -1052,7 +1039,7 @@
 
 	gtk_label_set_label (GTK_LABEL (label), title);
 	gtk_notebook_set_menu_label_text (GTK_NOTEBOOK (nb), child, short_title);
-	gtk_tooltips_set_tip (_gul_notebook_tooltips, ebox, title, NULL);
+	gtk_widget_set_tooltip_text (ebox, title);
 
 	g_free (short_title);
 }
diff -ur galeon-2.0.7.orig/utils/gul-toolbutton.c galeon-2.0.7/utils/gul-toolbutton.c
--- galeon-2.0.7.orig/utils/gul-toolbutton.c	2008-10-07 10:22:45.000000000 +0200
+++ galeon-2.0.7/utils/gul-toolbutton.c	2008-10-07 10:23:42.000000000 +0200
@@ -227,7 +227,7 @@
 
 	p->menu = gtk_menu_new ();
 	g_object_ref (p->menu);
-	gtk_object_sink (GTK_OBJECT (p->menu));
+	g_object_ref_sink (p->menu);
 
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- galeon.spec	7 Oct 2008 08:16:52 -0000	1.54
+++ galeon.spec	7 Oct 2008 09:11:18 -0000	1.55
@@ -12,6 +12,7 @@
 Patch1:		galeon-2.0.7-confignspr.patch
 Patch2:		galeon-2.0.7-print.patch
 Patch3:		galeon-2.0.7-dfltfont.patch
+Patch4:		galeon-2.0.7-warnings.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -47,6 +48,7 @@
 %patch1 -p1 -b .confignspr
 %patch2 -p1 -b .print
 %patch3 -p1 -b .dfltfont
+%patch4 -p1 -b .warnings
 
 
 %build

More information about the fedora-extras-commits mailing list