rpms/galeon/F-7 galeon-2.0.3-imgload.patch, NONE, 1.1 galeon.spec, 1.33, 1.34
Denis Leroy (denis)
fedora-extras-commits at redhat.com
Wed Sep 19 17:19:25 UTC 2007
Author: denis
Update of /cvs/pkgs/rpms/galeon/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16187
Modified Files:
galeon.spec
Added Files:
galeon-2.0.3-imgload.patch
Log Message:
Added patch to fix image loading preference
galeon-2.0.3-imgload.patch:
--- NEW FILE galeon-2.0.3-imgload.patch ---
--- galeon-2.0.3/mozilla/mozilla-notifiers.cpp.orig 2007-09-19 12:17:01.000000000 +0200
+++ galeon-2.0.3/mozilla/mozilla-notifiers.cpp 2007-09-19 12:19:08.000000000 +0200
@@ -139,7 +139,7 @@
{
{ CONF_FILTERING_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
{ CONF_FILTERING_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
- { CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "network.image.imageBehavior"},
+ { CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "permissions.default.image"},
{ CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
{ CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
{ CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
--- galeon-2.0.3/src/galeon-window.c.orig 2007-09-19 12:22:57.000000000 +0200
+++ galeon-2.0.3/src/galeon-window.c 2007-09-19 13:04:26.000000000 +0200
@@ -115,8 +115,8 @@
static gint GaleonWindowSignals[LAST_SIGNAL];
/* These are the values of in gconf for these items */
-#define VIEW_IMAGES_ALWAYS 0
-#define VIEW_IMAGES_CURRENT 1
+#define VIEW_IMAGES_ALWAYS 1
+#define VIEW_IMAGES_CURRENT 3
#define VIEW_IMAGES_NEVER 2
#define ACCEPT_COOKIES_ALWAYS 0
#define ACCEPT_COOKIES_CURRENT 1
@@ -468,7 +468,6 @@
static guint n_toggle_entries = G_N_ELEMENTS(toggle_entries);
-/* Keep this in order, see radio_group_set_from_value */
static GtkRadioActionEntry image_radio_entries[] = {
{ "ViewImagesAlwaysAction", NULL, N_("_Always"), NULL,
N_("View all images"), VIEW_IMAGES_ALWAYS },
@@ -480,7 +479,6 @@
static guint n_image_radio_entries = G_N_ELEMENTS (image_radio_entries);
-/* Keep this in order, see radio_group_set_from_value */
static GtkRadioActionEntry cookie_radio_entries[] = {
{ "WebCookiesAlwaysAction", NULL, N_("A_lways Allow"), NULL,
N_("Always accept cookies"), ACCEPT_COOKIES_ALWAYS },
@@ -1160,12 +1158,21 @@
radio_group_set_from_value (GaleonWindow *window, GtkRadioActionEntry *entries,
int n_entries, GConfValue *value)
{
- GtkAction *action;
+ GtkAction *action = NULL;
int val = gconf_value_get_int(value);
- g_return_if_fail (val < n_entries);
- g_return_if_fail (entries[val].value == val);
+ int i;
+
+ /* Figure out with GtkRadioActionEntry has our value. These
+ lists are always very short, just iterate rather than use a
+ reverse-lookup static table. */
+ for (i = 0; i < n_entries; i++) {
+ if (entries[i].value == val) {
+ action = gtk_action_group_get_action(window->priv->action_group, entries[i].name);
+ break;
+ }
+ }
- action = gtk_action_group_get_action(window->priv->action_group, entries[val].name);
+ g_return_if_fail (action != NULL);
if (! gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
{
Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-7/galeon.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- galeon.spec 18 Jul 2007 14:15:53 -0000 1.33
+++ galeon.spec 19 Sep 2007 17:18:53 -0000 1.34
@@ -3,13 +3,14 @@
Summary: GNOME2 Web browser based on Mozilla
Name: galeon
Version: 2.0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPL
Group: Applications/Internet
URL: http://galeon.sourceforge.net/
Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
Patch0: galeon-2.0.3-flashfix.patch
Patch1: galeon-2.0.3-plugins.patch
+Patch2: galeon-2.0.3-imgload.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
BuildRequires: gettext desktop-file-utils
@@ -41,6 +42,7 @@
%setup -q -n %{name}-%{version}%{?extraversion}
%patch0 -p1 -b .flashfix
%patch1 -p1 -b .plugins
+%patch2 -p1 -b .imgload
%build
@@ -117,6 +119,9 @@
%changelog
+* Wed Sep 19 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-11
+- Added patch to fix image loading preference
+
* Wed Jul 18 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-10
- Rebuild with gecko-libs 1.8.1.5
More information about the fedora-extras-commits
mailing list