?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
updated on Wed Jan 11 00:07:16 UTC 2012
[aur-mirror.git] / galeon / galeon-2.0.7-warnings.patch
blobdc2c6b1ef2ef60a792407ff02a86f785438c2486
1 diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-context-menu.c galeon-2.0.7/bookmarks/bookmarks-context-menu.c
2 --- galeon-2.0.7.orig/bookmarks/bookmarks-context-menu.c 2008-10-07 10:22:44.000000000 +0200
3 +++ galeon-2.0.7/bookmarks/bookmarks-context-menu.c 2008-10-07 10:23:42.000000000 +0200
4 @@ -236,7 +236,7 @@
5
6 p->menu = gtk_menu_new ();
7 g_object_ref (p->menu);
8 - gtk_object_sink (GTK_OBJECT (p->menu));
9 + g_object_ref_sink (p->menu);
10
11 if (GB_IS_SITE (p->bm))
12 {
13 diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-editor.c galeon-2.0.7/bookmarks/bookmarks-editor.c
14 --- galeon-2.0.7.orig/bookmarks/bookmarks-editor.c 2008-10-07 10:22:44.000000000 +0200
15 +++ galeon-2.0.7/bookmarks/bookmarks-editor.c 2008-10-07 10:23:42.000000000 +0200
16 @@ -524,7 +524,7 @@
17
18 gtk_widget_show (GTK_WIDGET (p->left_tree_view));
19 g_object_ref (p->left_tree_view);
20 - gtk_object_sink (GTK_OBJECT (p->left_tree_view));
21 + g_object_ref_sink (p->left_tree_view);
22
23 p->right_tree_view = gb_tree_view_new ();
24 if (p->location_source)
25 @@ -540,7 +540,7 @@
26
27 gtk_widget_show (GTK_WIDGET (p->right_tree_view));
28 g_object_ref (p->right_tree_view);
29 - gtk_object_sink (GTK_OBJECT (p->right_tree_view));
30 + g_object_ref_sink (p->right_tree_view);
31
32 gb_tree_view_set_autoexpand_roots (p->right_tree_view, FALSE);
33 }
34 diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-menu-item.c galeon-2.0.7/bookmarks/bookmarks-gtk-menu-item.c
35 --- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-menu-item.c 2008-10-07 10:22:44.000000000 +0200
36 +++ galeon-2.0.7/bookmarks/bookmarks-gtk-menu-item.c 2008-10-07 10:23:42.000000000 +0200
37 @@ -82,7 +82,6 @@
38 GB_GTK_MENU_ITEM_LAST_SIGNAL
39 };
40 static gint GbGtkMenuItemSignals[GB_GTK_MENU_ITEM_LAST_SIGNAL];
41 -static GtkTooltips *_gb_gtk_menu_item_tooltips = NULL;
42
43 /**
44 * GtkMenu object
45 @@ -115,14 +114,6 @@
46 GbGtkMenuItemPrivate *p = GB_GTK_MENU_ITEM_GET_PRIVATE (m);
47 m->priv = p;
48
49 - if (!_gb_gtk_menu_item_tooltips)
50 - {
51 - _gb_gtk_menu_item_tooltips = gtk_tooltips_new ();
52 - g_object_add_weak_pointer (G_OBJECT (_gb_gtk_menu_item_tooltips),
53 - (gpointer)&_gb_gtk_menu_item_tooltips);
54 - }
55 - g_object_ref (_gb_gtk_menu_item_tooltips);
56 - gtk_object_sink (GTK_OBJECT(_gb_gtk_menu_item_tooltips));
57 }
58
59 static void
60 @@ -153,8 +144,6 @@
61
62 g_object_unref (G_OBJECT (p->bookmark));
63
64 - g_object_unref (_gb_gtk_menu_item_tooltips);
65 -
66 G_OBJECT_CLASS (gb_gtk_menu_item_parent_class)->finalize (o);
67 }
68
69 @@ -228,9 +217,7 @@
70 char *tooltip;
71
72 tooltip = g_strjoinv("\n\n", parts);
73 - gtk_tooltips_set_tip (_gb_gtk_menu_item_tooltips,
74 - GTK_WIDGET(bmi),
75 - tooltip, NULL);
76 + gtk_widget_set_tooltip_text (GTK_WIDGET(bmi), tooltip);
77 g_free (tooltip);
78 }
79 }
80 diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar.c galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar.c
81 --- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar.c 2008-10-07 10:22:44.000000000 +0200
82 +++ galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar.c 2008-10-07 10:23:42.000000000 +0200
83 @@ -247,7 +247,7 @@
84 * feedback */
85 toolbar->priv->drag_item = gtk_tool_button_new (NULL, "m");
86 g_object_ref (G_OBJECT (toolbar->priv->drag_item));
87 - gtk_object_sink (GTK_OBJECT (toolbar->priv->drag_item));
88 + g_object_ref_sink (toolbar->priv->drag_item);
89 }
90
91 gdk_drag_status (context, context->suggested_action, time);
92 diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar-set.c galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar-set.c
93 --- galeon-2.0.7.orig/bookmarks/bookmarks-gtk-toolbar-set.c 2008-10-07 10:22:44.000000000 +0200
94 +++ galeon-2.0.7/bookmarks/bookmarks-gtk-toolbar-set.c 2008-10-07 10:23:42.000000000 +0200
95 @@ -228,7 +228,7 @@
96
97 gtk_widget_show (GTK_WIDGET (tb));
98 g_hash_table_insert (p->folder_to_toolbar, g_object_ref (f), g_object_ref (tb));
99 - gtk_object_sink (GTK_OBJECT (tb));
100 + g_object_ref_sink (tb);
101
102 if (p->add_func)
103 {
104 diff -ur galeon-2.0.7.orig/bookmarks/bookmarks-icon-provider.c galeon-2.0.7/bookmarks/bookmarks-icon-provider.c
105 --- galeon-2.0.7.orig/bookmarks/bookmarks-icon-provider.c 2008-10-07 10:22:44.000000000 +0200
106 +++ galeon-2.0.7/bookmarks/bookmarks-icon-provider.c 2008-10-07 10:23:42.000000000 +0200
107 @@ -209,7 +209,7 @@
108 GtkWidget *dummy = gtk_toolbar_new ();
109
110 g_object_ref (dummy);
111 - gtk_object_sink (GTK_OBJECT (dummy));
112 + g_object_ref_sink (dummy);
113
114 if (p->folder_pixbuf_data)
115 {
116 diff -ur galeon-2.0.7.orig/configure.in galeon-2.0.7/configure.in
117 --- galeon-2.0.7.orig/configure.in 2008-10-07 10:22:45.000000000 +0200
118 +++ galeon-2.0.7/configure.in 2008-10-07 10:23:42.000000000 +0200
119 @@ -367,9 +367,9 @@
120 #CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS $GALEON_DEPENDENCY_CFLAGS"
121 #CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS"
122 #LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS $MOZILLA_COMPONENT_LIBS"
123 -CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` $GALEON_DEPENDENCY_CFLAGS"
124 -CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
125 -LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom`"
126 +CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA_XPCOM` $GALEON_DEPENDENCY_CFLAGS"
127 +CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA_XPCOM`"
128 +LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA_XPCOM`"
129
130
131 TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
132 diff -ur galeon-2.0.7.orig/embed/galeon-embed-shell.c galeon-2.0.7/embed/galeon-embed-shell.c
133 --- galeon-2.0.7.orig/embed/galeon-embed-shell.c 2008-10-07 10:22:45.000000000 +0200
134 +++ galeon-2.0.7/embed/galeon-embed-shell.c 2008-10-07 10:23:42.000000000 +0200
135 @@ -321,7 +321,7 @@
136 {
137 shell->priv->js_console = GALEON_JS_CONSOLE (galeon_js_console_new ());
138 g_object_ref (shell->priv->js_console);
139 - gtk_object_sink (GTK_OBJECT (shell->priv->js_console));
140 + g_object_ref_sink (shell->priv->js_console);
141 }
142
143 return shell->priv->js_console;
144 diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-item.c galeon-2.0.7/libegg/dock/egg-dock-item.c
145 --- galeon-2.0.7.orig/libegg/dock/egg-dock-item.c 2008-10-07 10:22:44.000000000 +0200
146 +++ galeon-2.0.7/libegg/dock/egg-dock-item.c 2008-10-07 10:23:42.000000000 +0200
147 @@ -1154,7 +1154,7 @@
148 {
149 GEnumClass *enum_class = G_ENUM_CLASS (g_type_class_ref (EGG_TYPE_DOCK_PLACEMENT));
150 GEnumValue *enum_value = g_enum_get_value (enum_class, position);
151 - gchar *name = enum_value ? enum_value->value_name : NULL;
152 + const gchar *name = enum_value ? enum_value->value_name : NULL;
153
154 g_warning (("Unsupported docking strategy %s in dock object of type %s"),
155 name, G_OBJECT_TYPE_NAME (object));
156 @@ -1485,13 +1485,13 @@
157 NULL, item);
158 g_object_set (item->_priv->tab_label, "item", NULL, NULL);
159 }
160 - gtk_widget_unref (item->_priv->tab_label);
161 + g_object_unref (item->_priv->tab_label);
162 item->_priv->tab_label = NULL;
163 }
164
165 if (tablabel) {
166 - gtk_widget_ref (tablabel);
167 - gtk_object_sink (GTK_OBJECT (tablabel));
168 + g_object_ref (tablabel);
169 + g_object_ref_sink (tablabel);
170 item->_priv->tab_label = tablabel;
171 if (EGG_IS_DOCK_TABLABEL (tablabel)) {
172 g_object_set (tablabel, "item", item, NULL);
173 @@ -1564,7 +1564,7 @@
174 "host", item,
175 NULL));
176 g_object_ref (item->_priv->ph);
177 - gtk_object_sink (GTK_OBJECT (item->_priv->ph));
178 + g_object_ref_sink (item->_priv->ph);
179 }
180
181 egg_dock_object_freeze (EGG_DOCK_OBJECT (item));
182 @@ -1627,7 +1627,7 @@
183 if (reference && EGG_DOCK_OBJECT_ATTACHED (reference)) {
184 if (EGG_IS_DOCK_PLACEHOLDER (reference)) {
185 g_object_ref (reference);
186 - gtk_object_sink (GTK_OBJECT (reference));
187 + g_object_ref_sink (reference);
188 item->_priv->ph = EGG_DOCK_PLACEHOLDER (reference);
189 }
190 else {
191 @@ -1637,7 +1637,7 @@
192 "host", reference,
193 NULL));
194 g_object_ref (item->_priv->ph);
195 - gtk_object_sink (GTK_OBJECT (item->_priv->ph));
196 + g_object_ref_sink (item->_priv->ph);
197 }
198 }
199 }
200 diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-master.c galeon-2.0.7/libegg/dock/egg-dock-master.c
201 --- galeon-2.0.7.orig/libegg/dock/egg-dock-master.c 2008-10-07 10:22:44.000000000 +0200
202 +++ galeon-2.0.7/libegg/dock/egg-dock-master.c 2008-10-07 10:23:42.000000000 +0200
203 @@ -736,7 +736,7 @@
204 }
205 else {
206 g_object_ref (object);
207 - gtk_object_sink (GTK_OBJECT (object));
208 + g_object_ref_sink (object);
209 g_hash_table_insert (master->dock_objects, g_strdup (object->name), object);
210 }
211 }
212 diff -ur galeon-2.0.7.orig/libegg/dock/egg-dock-object.c galeon-2.0.7/libegg/dock/egg-dock-object.c
213 --- galeon-2.0.7.orig/libegg/dock/egg-dock-object.c 2008-10-07 10:22:44.000000000 +0200
214 +++ galeon-2.0.7/libegg/dock/egg-dock-object.c 2008-10-07 10:23:42.000000000 +0200
215 @@ -28,6 +28,7 @@
216 #include <egg-macros.h>
217 #include <stdlib.h>
218 #include <string.h>
219 +#include <gtk/gtkobject.h>
220
221 #include "egg-dock-object.h"
222 #include "egg-dock-master.h"
223 @@ -388,7 +389,7 @@
224 g_object_unref (child);
225 }
226 /* sink the widget, so any automatic floating widget is destroyed */
227 - gtk_object_sink (GTK_OBJECT (object));
228 + g_object_ref_sink (object);
229 /* don't reenter */
230 object->reduce_pending = FALSE;
231 egg_dock_object_thaw (object);
232 diff -ur galeon-2.0.7.orig/libegg/egg-editable-toolbar.c galeon-2.0.7/libegg/egg-editable-toolbar.c
233 --- galeon-2.0.7.orig/libegg/egg-editable-toolbar.c 2008-10-07 10:22:44.000000000 +0200
234 +++ galeon-2.0.7/libegg/egg-editable-toolbar.c 2008-10-07 10:23:42.000000000 +0200
235 @@ -476,7 +476,7 @@
236 create_item_from_action (etoolbar, id, type,
237 data_is_separator (id), NULL);
238 g_object_ref (etoolbar->priv->dragged_item);
239 - gtk_object_sink (GTK_OBJECT (etoolbar->priv->dragged_item));
240 + g_object_ref_sink (etoolbar->priv->dragged_item);
241 }
242 else
243 {
244 @@ -1278,7 +1278,7 @@
245 toolbar->priv->fixed_toolbar = gtk_toolbar_new ();
246 gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar->priv->fixed_toolbar), FALSE);
247 g_object_ref (toolbar->priv->fixed_toolbar);
248 - gtk_object_sink (GTK_OBJECT (toolbar->priv->fixed_toolbar));
249 + g_object_ref_sink (toolbar->priv->fixed_toolbar);
250 }
251
252 if (toolbar->priv->fixed)
253 @@ -1293,7 +1293,7 @@
254 if (fixed)
255 {
256 g_object_ref (fixed);
257 - gtk_object_sink (GTK_OBJECT (fixed));
258 + g_object_ref_sink (fixed);
259
260 gtk_toolbar_insert (GTK_TOOLBAR (toolbar->priv->fixed_toolbar), fixed, 0);
261 }
262 diff -ur galeon-2.0.7.orig/mozilla/EphyPromptService.cpp galeon-2.0.7/mozilla/EphyPromptService.cpp
263 --- galeon-2.0.7.orig/mozilla/EphyPromptService.cpp 2008-10-07 10:22:45.000000000 +0200
264 +++ galeon-2.0.7/mozilla/EphyPromptService.cpp 2008-10-07 10:23:42.000000000 +0200
265 @@ -146,7 +146,7 @@
266
267 mDialog = GTK_DIALOG (gtk_dialog_new ());
268 g_object_ref (mDialog);
269 - gtk_object_sink (GTK_OBJECT (mDialog));
270 + g_object_ref_sink (mDialog);
271
272 char *title = NULL;
273 if (aTitle)
274 diff -ur galeon-2.0.7.orig/mozilla/HeaderSniffer.cpp galeon-2.0.7/mozilla/HeaderSniffer.cpp
275 --- galeon-2.0.7.orig/mozilla/HeaderSniffer.cpp 2008-10-07 10:22:45.000000000 +0200
276 +++ galeon-2.0.7/mozilla/HeaderSniffer.cpp 2008-10-07 10:23:42.000000000 +0200
277 @@ -586,11 +586,12 @@
278
279 if (mDocument && (flags & EMBED_PERSIST_SAVE_CONTENT))
280 {
281 - GtkWidget *toggle;
282 -
283 /* Reset the flags to turn off content, the user toggles
284 * if they want to turn it on */
285 - (gint&)flags &= ~EMBED_PERSIST_SAVE_CONTENT;
286 + GtkWidget *toggle;
287 + int f = flags & ~EMBED_PERSIST_SAVE_CONTENT;
288 + flags = (EmbedPersistFlags) f;
289 +
290 galeon_embed_persist_set_flags (mEmbedPersist, flags);
291
292 toggle = gtk_check_button_new_with_mnemonic (_("Save _with content"));
293 diff -ur galeon-2.0.7.orig/mozilla/mozilla-embed-shell.cpp galeon-2.0.7/mozilla/mozilla-embed-shell.cpp
294 --- galeon-2.0.7.orig/mozilla/mozilla-embed-shell.cpp 2008-10-07 10:22:45.000000000 +0200
295 +++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp 2008-10-07 10:23:42.000000000 +0200
296 @@ -21,9 +21,21 @@
297 #endif
298
299 #include <nscore.h>
300 +
301 +/* Some versions of nscore.h appears to #define nscore_h___, while
302 + * gtkmozembed.h looks for nscore_h__ to see if stuff needs
303 + * redefining (what were they thinking?!). Define explicitly, then
304 + * curse. */
305 +#ifndef nscore_h__
306 +#define nscore_h__
307 +#endif
308 +
309 #include <nsComponentManagerUtils.h>
310 #include <nsServiceManagerUtils.h>
311
312 +#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
313 +#define HAVE_VISIBILITY_ATTRIBUTE 1
314 +
315 #ifdef XPCOM_GLUE
316 #include <nsXPCOMGlue.h>
317 #include <gtkmozembed_glue.cpp>
318 diff -ur galeon-2.0.7.orig/mozilla/mozilla-notifiers.cpp galeon-2.0.7/mozilla/mozilla-notifiers.cpp
319 --- galeon-2.0.7.orig/mozilla/mozilla-notifiers.cpp 2008-10-07 10:22:45.000000000 +0200
320 +++ galeon-2.0.7/mozilla/mozilla-notifiers.cpp 2008-10-07 10:23:42.000000000 +0200
321 @@ -131,7 +131,7 @@
322
323 static const struct
324 {
325 - char *gconf_key;
326 + const char *gconf_key;
327 guint pref_type;
328 const char *mozilla_key;
329 }
330 @@ -369,7 +369,7 @@
331 for (i = 0; i < num_font_languages; i++)
332 {
333 int k;
334 - char *types [] = { "serif", "sans-serif", "cursive", "fantasy", "monospace" };
335 + const char *types [] = { "serif", "sans-serif", "cursive", "fantasy", "monospace" };
336 char key[255];
337 char *info;
338 const char* language = font_languages[i].key;
339 @@ -614,7 +614,7 @@
340 g_slist_free(language_list);
341 }
342
343 -static char *autodetect_charset_prefs[] =
344 +static const char *autodetect_charset_prefs[] =
345 {
346 "",
347 "zh_parallel_state_machine",
348 diff -ur galeon-2.0.7.orig/mozilla/ProgressListener.h galeon-2.0.7/mozilla/ProgressListener.h
349 --- galeon-2.0.7.orig/mozilla/ProgressListener.h 2008-10-07 10:22:45.000000000 +0200
350 +++ galeon-2.0.7/mozilla/ProgressListener.h 2008-10-07 10:23:42.000000000 +0200
351 @@ -60,7 +60,7 @@
352 #define G_PROGRESSDIALOG_CLASSNAME "Galeon's Download Progress Dialog"
353 #define G_PROGRESSDIALOG_CONTRACTID "@mozilla.org/progressdialog;1"
354
355 -class GProgressListener :
356 +class NS_COM_GLUE GProgressListener :
357 public nsITransfer,
358 public nsSupportsWeakReference
359 {
360 diff -ur galeon-2.0.7.orig/utils/galeon-sidebar.c galeon-2.0.7/utils/galeon-sidebar.c
361 --- galeon-2.0.7.orig/utils/galeon-sidebar.c 2008-10-07 10:22:45.000000000 +0200
362 +++ galeon-2.0.7/utils/galeon-sidebar.c 2008-10-07 10:23:42.000000000 +0200
363 @@ -304,7 +304,7 @@
364
365 sidebar->priv->title_menu = gtk_menu_new ();
366 g_object_ref (sidebar->priv->title_menu);
367 - gtk_object_sink (GTK_OBJECT (sidebar->priv->title_menu));
368 + g_object_ref_sink (sidebar->priv->title_menu);
369 gtk_widget_show (sidebar->priv->title_button);
370 gtk_widget_show (sidebar->priv->title_menu);
371
372 diff -ur galeon-2.0.7.orig/utils/gul-download.c galeon-2.0.7/utils/gul-download.c
373 --- galeon-2.0.7.orig/utils/gul-download.c 2008-10-07 10:22:45.000000000 +0200
374 +++ galeon-2.0.7/utils/gul-download.c 2008-10-07 10:23:42.000000000 +0200
375 @@ -65,7 +65,12 @@
376 gchar *dirName, *utf8DirName, *prefDir = NULL;
377 gsize bytesRead, bytesWritten;
378 gint retVal;
379 - GtkWidget *fileSel = gtk_file_selection_new(_("Choose destination folder"));
380 + GtkWidget *fileSel =
381 + gtk_file_chooser_dialog_new(_("Choose destination folder"),
382 + NULL,
383 + GTK_FILE_CHOOSER_ACTION_SAVE,
384 + NULL,
385 + NULL);
386
387 /* Dirname must end in a '/' for the file selection to treat
388 * it as a directory. When we have a UI to set the value, we
389 @@ -96,10 +101,9 @@
390 return;
391 }
392
393 - gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileSel),
394 - dirName);
395 - gtk_widget_set_sensitive(GTK_FILE_SELECTION(fileSel)
396 - ->file_list, FALSE);
397 + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(fileSel),
398 + dirName);
399 + gtk_widget_set_sensitive(fileSel, FALSE);
400
401 retVal = gtk_dialog_run(GTK_DIALOG(fileSel));
402
403 @@ -109,7 +113,7 @@
404 * which is what we need.
405 */
406 gul_download_save_url_with_dir(url,
407 - gtk_file_selection_get_filename(GTK_FILE_SELECTION(fileSel)));
408 + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fileSel)));
409 }
410 gtk_widget_hide(fileSel);
411 gtk_widget_destroy(fileSel);
412 diff -ur galeon-2.0.7.orig/utils/gul-notebook.c galeon-2.0.7/utils/gul-notebook.c
413 --- galeon-2.0.7.orig/utils/gul-notebook.c 2008-10-07 10:22:45.000000000 +0200
414 +++ galeon-2.0.7/utils/gul-notebook.c 2008-10-07 10:23:42.000000000 +0200
415 @@ -77,7 +77,6 @@
416 /* Local variables */
417 static GdkCursor *cursor = NULL;
418 static GList *notebooks = NULL;
419 -static GtkTooltips *_gul_notebook_tooltips = NULL;
420
421
422 /* Local functions */
423 @@ -662,15 +661,6 @@
424 static void
425 gul_notebook_init (GulNotebook *notebook)
426 {
427 - if (!_gul_notebook_tooltips)
428 - {
429 - _gul_notebook_tooltips = gtk_tooltips_new ();
430 - g_object_add_weak_pointer (G_OBJECT (_gul_notebook_tooltips),
431 - (gpointer)&_gul_notebook_tooltips);
432 - }
433 - g_object_ref (_gul_notebook_tooltips);
434 - gtk_object_sink (GTK_OBJECT (_gul_notebook_tooltips));
435 -
436 notebook->priv = g_new (GulNotebookPrivate, 1);
437
438 notebook->priv->drag_in_progress = FALSE;
439 @@ -706,8 +696,6 @@
440
441 g_free (notebook->priv);
442
443 - g_object_unref (_gul_notebook_tooltips);
444 -
445 G_OBJECT_CLASS (parent_class)->finalize (object);
446 }
447
448 @@ -794,7 +782,7 @@
449 rcstyle = gtk_rc_style_new ();
450 rcstyle->xthickness = rcstyle->ythickness = 0;
451 gtk_widget_modify_style (close_button, rcstyle);
452 - gtk_rc_style_unref (rcstyle),
453 + g_object_unref (rcstyle),
454
455 image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
456 GTK_ICON_SIZE_MENU);
457 @@ -802,8 +790,7 @@
458 gtk_widget_set_size_request (close_button, size.width, size.height);
459 gtk_container_add (GTK_CONTAINER (close_button), image);
460
461 - gtk_tooltips_set_tip (_gul_notebook_tooltips, close_button,
462 - _("Close this tab"), NULL);
463 + gtk_widget_set_tooltip_text (close_button, _("Close this tab"));
464
465 /* setup label, need eventbox for tooltips and left-padding to get
466 * comfortable space between the label and icon/tab border */
467 @@ -997,7 +984,7 @@
468 /* remove the tool tip for this ebox */
469 label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (nb), child);
470 ebox = GTK_WIDGET (g_object_get_data (G_OBJECT (label), "label-ebox"));
471 - gtk_tooltips_set_tip (_gul_notebook_tooltips, ebox, NULL, NULL);
472 + gtk_widget_set_tooltip_text (ebox, NULL);
473
474 /* If we don't clear the icon then for some reason it gets reset back
475 * to an empty icon. This means that although gul_notebook_move_page() has
476 @@ -1052,7 +1039,7 @@
477
478 gtk_label_set_label (GTK_LABEL (label), title);
479 gtk_notebook_set_menu_label_text (GTK_NOTEBOOK (nb), child, short_title);
480 - gtk_tooltips_set_tip (_gul_notebook_tooltips, ebox, title, NULL);
481 + gtk_widget_set_tooltip_text (ebox, title);
482
483 g_free (short_title);
484 }
485 diff -ur galeon-2.0.7.orig/utils/gul-toolbutton.c galeon-2.0.7/utils/gul-toolbutton.c
486 --- galeon-2.0.7.orig/utils/gul-toolbutton.c 2008-10-07 10:22:45.000000000 +0200
487 +++ galeon-2.0.7/utils/gul-toolbutton.c 2008-10-07 10:23:42.000000000 +0200
488 @@ -227,7 +227,7 @@
489
490 p->menu = gtk_menu_new ();
491 g_object_ref (p->menu);
492 - gtk_object_sink (GTK_OBJECT (p->menu));
493 + g_object_ref_sink (p->menu);
494
495 hbox = gtk_hbox_new (FALSE, 0);
496 gtk_widget_show (hbox);
497 --- galeon-2.0.7/mozilla/ProgressListener.cpp.orig 2009-02-15 14:35:27.000000000 +0100
498 +++ galeon-2.0.7/mozilla/ProgressListener.cpp 2009-02-15 14:30:20.000000000 +0100
499 @@ -587,12 +587,12 @@
500 GulCString helperId(helperDesc);
501
502 // Format <usertime>:<helperapp id>
503 - char *colon = strchr (helperId.get(), ':');
504 + const char *colon = strchr (helperId.get(), ':');
505 g_return_val_if_fail (colon, NS_ERROR_FAILURE);
506
507 const char *helperappid = colon+1;
508
509 - guint32 usertime = strtoul (helperId.get(), &colon, 0);
510 + guint32 usertime = strtoul (helperId.get(), (char**)&colon, 0);
511
512 GnomeVFSMimeApplication *helper =
513 #ifdef HAVE_NEW_GNOME_VFS_MIME_API
AUR mirror