rpms/galeon/devel galeon-2.0.3-imgload.patch, NONE, 1.1 galeon-2.0.3-printdial.patch, NONE, 1.1 galeon.spec, 1.34, 1.35

[Denis Leroy (denis)]

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11542

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-imgload.patch galeon-2.0.3-printdial.patch 
Log Message:
- Added patch to fix image load preference (#292361)
- Added patch to fix print dialog crash (#285661)


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)))
 	{

galeon-2.0.3-printdial.patch:

--- NEW FILE galeon-2.0.3-printdial.patch ---
--- galeon-2.0.3/embed/print-dialog.c.orig	2007-09-19 18:25:35.000000000 +0200
+++ galeon-2.0.3/embed/print-dialog.c	2007-09-19 18:51:01.000000000 +0200
@@ -665,15 +665,20 @@
 	GtkTreeModel *model;
 	GPtrArray *paper_array;
 	guint i;
+	gint combo_selection;
 
 	name_combo = galeon_dialog_get_control(dialog, NAME_PROP);
 	command_entry = galeon_dialog_get_control(dialog, COMMAND_PROP);
 
-	priv->selected_printer =
-			gtk_combo_box_get_active(GTK_COMBO_BOX(name_combo));
+	/* Ignore callback if combo box was not yet initialized */
+	combo_selection = gtk_combo_box_get_active(GTK_COMBO_BOX(name_combo));
+	if (combo_selection < 0)
+		return;
 
+	priv->selected_printer = combo_selection;
 	info = (EmbedPrintInfo *)g_list_nth_data(priv->printers,
 	                                         priv->selected_printer);
+	g_return_if_fail (info != NULL);
 
 	gtk_widget_set_sensitive(command_entry, info->can_change_command);
 


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- galeon.spec	22 Aug 2007 09:29:06 -0000	1.34
+++ galeon.spec	19 Sep 2007 17:06:37 -0000	1.35
@@ -3,13 +3,15 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPLv2+
 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
+Patch3:		galeon-2.0.3-printdial.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -41,6 +43,8 @@
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .flashfix
 %patch1 -p1 -b .plugins
+%patch2 -p1 -b .imgload
+%patch3 -p1 -b .printdial
 
 
 %build
@@ -115,6 +119,10 @@
 
 
 %changelog
+* Wed Sep 19 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-12
+- Added patch to fix image load preference (#292361)
+- Added patch to fix print dialog crash (#285661)
+
 * Wed Aug 22 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-11
 - F-8 rebuild