talons

commit cfe802b13470dfca5ec55b95814310c7eb70707b
parent 56c256b492fb3db3985d4d3a86f97202f3ad822a
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 13 Mar 2013 13:46:45 +0000

2013-03-13 [colin]	3.9.0cvs121

	* src/plugins/fancy/fancy_prefs.c
		More whitespace!

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/fancy/fancy_prefs.c
 | 
21
++++++++++++++-------

4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-13 [colin]	3.9.0cvs121
+
+	* src/plugins/fancy/fancy_prefs.c
+		More whitespace!
+
 2013-03-13 [colin]	3.9.0cvs120
 
 	* src/plugins/fancy/fancy_prefs.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4618,3 +4618,4 @@
 ( cvs diff -u -r 1.395.2.463 -r 1.395.2.464 src/summaryview.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/perl/tools/Makefile.am;  ) > 3.9.0cvs118.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/fancy/fancy_prefs.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/fancy/fancy_prefs.h;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/fancy/fancy_viewer.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/fancy/fancy_viewer.h;  ) > 3.9.0cvs119.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/fancy/fancy_prefs.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fancy/fancy_prefs.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/fancy/fancy_viewer.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/fancy/fancy_viewer.h;  ) > 3.9.0cvs120.patchset
+( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/fancy/fancy_prefs.c;  ) > 3.9.0cvs121.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=120
+EXTRA_VERSION=121
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
@@ -133,31 +133,38 @@ static void remote_content_set_labels_cb(GtkWidget *button, FancyPrefsPage *pref
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	gboolean remote_enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->enable_remote_content));
+	gboolean remote_enabled = gtk_toggle_button_get_active(
+					GTK_TOGGLE_BUTTON(prefs_page->enable_remote_content));
 
 	/* Enable images */
 	gtk_button_set_label(GTK_BUTTON(prefs_page->enable_images),
-			     remote_enabled ? _("Display images") : _("Display embedded images"));
+			     remote_enabled ? _("Display images")
+					    : _("Display embedded images"));
 
 	/* Enable Javascript */
 	gtk_button_set_label(GTK_BUTTON(prefs_page->enable_scripts),
-			     remote_enabled ? _("Execute javascript") : _("Execute embedded javascript"));
+			     remote_enabled ? _("Execute javascript")
+					    : _("Execute embedded javascript"));
 
 	/* Enable java */
 	gtk_button_set_label(GTK_BUTTON(prefs_page->enable_java),
-			     remote_enabled ? _("Execute Java applets") : _("Execute embedded Java applets"));
+			     remote_enabled ? _("Execute Java applets")
+					    : _("Execute embedded Java applets"));
 
 	/* Enable plugins */
 	gtk_button_set_label(GTK_BUTTON(prefs_page->enable_plugins),
-			     remote_enabled ? _("Render objects using plugins") : _("Render embedded objects using plugins"));
+			     remote_enabled ? _("Render objects using plugins")
+					    : _("Render embedded objects using plugins"));
 
 	/* Open links */
 	model = gtk_combo_box_get_model(GTK_COMBO_BOX(prefs_page->open_external));
 	if (gtk_tree_model_get_iter_first (model, &iter)) {
 		if (remote_enabled)
-			gtk_list_store_set(model, &iter, COMBOBOX_TEXT, _("Open in viewer (remote content is enabled)"), -1);
+			gtk_list_store_set(model, &iter, COMBOBOX_TEXT,
+					   _("Open in viewer (remote content is enabled)"), -1);
 		else
-			gtk_list_store_set(model, &iter, COMBOBOX_TEXT, _("Do nothing (remote content is disabled)"), -1);
+			gtk_list_store_set(model, &iter, COMBOBOX_TEXT,
+					   _("Do nothing (remote content is disabled)"), -1);
 	}
 
 }