[galeon/f13/master: 10/12] - Add some workarounds for crashes involving embeds coming and going without being sufficiently ac
Yanko Kaneti
yaneti at fedoraproject.org
Thu Sep 16 21:29:29 UTC 2010
commit eda660b07f8cfba5e40d4a50fbb052429a91f807
Author: Yanko Kaneti <yaneti at declera.com>
Date: Fri Sep 17 00:14:25 2010 +0300
- Add some workarounds for crashes involving embeds coming and going without
being sufficiently accounted for e.g. various popups.
- Use existing network status icons for online/offline status.
...g-network-status-icons-for-the-online-off.patch | 27 ++++++++++++++++++++
0001-Workaround-embed-missing-crash.patch | 26 +++++++++++++++++++
0001-Workaround-tab-label-related-crashes.patch | 27 ++++++++++++++++++++
galeon.spec | 13 +++++++++-
4 files changed, 92 insertions(+), 1 deletions(-)
---
diff --git a/0001-Use-existing-network-status-icons-for-the-online-off.patch b/0001-Use-existing-network-status-icons-for-the-online-off.patch
new file mode 100644
index 0000000..e0e3ec7
--- /dev/null
+++ b/0001-Use-existing-network-status-icons-for-the-online-off.patch
@@ -0,0 +1,27 @@
+From 4fcf7ccb3988259bf6b8d80934235899041133ad Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Wed, 15 Sep 2010 19:17:45 +0300
+Subject: [PATCH] Use existing network status icons for the online/offline indicator
+
+---
+ utils/pixbuf-cache.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utils/pixbuf-cache.h b/utils/pixbuf-cache.h
+index b2e5649..0d18e0b 100644
+--- a/utils/pixbuf-cache.h
++++ b/utils/pixbuf-cache.h
+@@ -45,8 +45,8 @@ void gul_pixbuf_cache_register_stocks (void);
+ #define STOCK_SPINNER_REST "gnome-spinner-rest"
+ #define STOCK_SELECT_ALL "stock_select-all"
+ #define STOCK_EDIT_BOOKMARK "stock_edit-bookmark"
+-#define STOCK_CONNECT "stock_connect"
+-#define STOCK_DISCONNECT "stock_disconnect"
++#define STOCK_CONNECT "network-idle"
++#define STOCK_DISCONNECT "network-offline"
+ #define STOCK_LOCK_BROKEN "stock_lock-broken"
+
+ G_END_DECLS
+--
+1.7.2.3
+
diff --git a/0001-Workaround-embed-missing-crash.patch b/0001-Workaround-embed-missing-crash.patch
new file mode 100644
index 0000000..6e268b1
--- /dev/null
+++ b/0001-Workaround-embed-missing-crash.patch
@@ -0,0 +1,26 @@
+From 5b44e519e258e84b7aa7301f6425fb2dffa60456 Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Wed, 15 Sep 2010 18:58:23 +0300
+Subject: [PATCH] Workaround embed missing crash
+
+Its not a fix but a bandaid.
+---
+ src/galeon-window.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/galeon-window.c b/src/galeon-window.c
+index 57a5b74..1349446 100644
+--- a/src/galeon-window.c
++++ b/src/galeon-window.c
+@@ -2790,7 +2790,7 @@ sync_tab_location (GaleonTab *tab, GParamSpec *pspec, GaleonWindow *window)
+ "label", block_images_str, NULL);
+
+ embed = galeon_tab_get_embed (tab);
+- can_view_source = galeon_embed_can_view_source (embed);
++ can_view_source = embed ? galeon_embed_can_view_source (embed) : FALSE;
+ g_object_set(G_OBJECT(ACTION_ITEM(VIEW_SOURCE_ACTION)),
+ "sensitive", can_view_source, NULL);
+
+--
+1.7.2.3
+
diff --git a/0001-Workaround-tab-label-related-crashes.patch b/0001-Workaround-tab-label-related-crashes.patch
new file mode 100644
index 0000000..7488174
--- /dev/null
+++ b/0001-Workaround-tab-label-related-crashes.patch
@@ -0,0 +1,27 @@
+From a620eb30751fa921f1d8d00f0511e267e998859a Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Wed, 15 Sep 2010 15:47:20 +0300
+Subject: [PATCH] Workaround tab label related crashes.
+
+Try to workaround tab label related crashes with recent xulrunners.
+Its not a fix but a bandaid.
+---
+ src/galeon-tab-menu.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/galeon-tab-menu.c b/src/galeon-tab-menu.c
+index 05d9eaa..f6640d2 100644
+--- a/src/galeon-tab-menu.c
++++ b/src/galeon-tab-menu.c
+@@ -71,6 +71,8 @@ update_title_cb (GaleonEmbed* embed, GtkAction *action)
+ {
+ GaleonTab *tab = g_object_get_data (G_OBJECT (action), "GaleonTab");
+
++ g_return_if_fail (GALEON_IS_TAB (tab));
++
+ const char *title = galeon_tab_get_title(tab);
+ gchar *title_s = gul_string_shorten(title,
+ MENU_ITEM_MAX_LENGTH);
+--
+1.7.2.3
+
diff --git a/galeon.spec b/galeon.spec
index 23ea797..7c2cb34 100644
--- a/galeon.spec
+++ b/galeon.spec
@@ -3,7 +3,7 @@
Summary: GNOME2 Web browser based on Mozilla
Name: galeon
Version: 2.0.7
-Release: 31%{?dist}
+Release: 32%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://galeon.sourceforge.net/
@@ -22,6 +22,9 @@ Patch12: galeon-2.0.7-nojavaconsole.patch
Patch13: galeon-2.0.7-spinnericon.patch
Patch14: galeon-2.0.7-libX11.patch
Patch15: galeon-2.0.7-bug418439.patch
+Patch16: 0001-Workaround-embed-missing-crash.patch
+Patch17: 0001-Workaround-tab-label-related-crashes.patch
+Patch18: 0001-Use-existing-network-status-icons-for-the-online-off.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
BuildRequires: gettext desktop-file-utils
@@ -70,6 +73,9 @@ makes sense. Galeon was written to do just one thing - browse the web.
%patch13 -p1 -b .spinnericon
%patch14 -p1 -b .libX11
%patch15 -p1 -b .bug418439
+%patch16 -p1 -b .workaroundembeds
+%patch17 -p1 -b .workaroundtablabels
+%patch18 -p1 -b .offlineicons
libtoolize --force
autoreconf -f
@@ -146,6 +152,11 @@ update-desktop-database > /dev/null 2>&1 || :
%changelog
+* Wed Sep 17 2010 Yanko Kaneti <yaneti at declera.com> - 2.0.7-32
+- Add some workarounds for crashes involving embeds coming and going without
+ being sufficiently accounted for e.g. various popups.
+- Use existing network status icons for online/offline status.
+
* Wed Sep 08 2010 Jan Horak <jhorak at redhat.com> - 2.0.7-31
- Rebuild against newer gecko
More information about the scm-commits
mailing list