From: Colin Leroy <colin@colino.net>
Date: Sat, 5 Jul 2008 15:38:37 +0000 (+0000)
Subject: 2008-07-05 [colin]	3.5.0cvs12
X-Git-Tag: rel_3_6_0~145
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1530f6a20d9f63612e1f2b9e0b37341408d7da93;hp=3247d40c29e3983a7148c76484efb718ab76b02f

2008-07-05 [colin]	3.5.0cvs12

	* src/mainwindow.c
		MAEMO: Fix bug 1620, 'Can't use hardware zoom buttons'
---

diff --git a/ChangeLog b/ChangeLog
index 23bc83d68..04291fb6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-05 [colin]	3.5.0cvs12
+
+	* src/mainwindow.c
+		MAEMO: Fix bug 1620, 'Can't use hardware zoom buttons'
+
 2008-07-05 [colin]	3.5.0cvs11
 
 	* src/news.c
diff --git a/PATCHSETS b/PATCHSETS
index 7bfeea81b..ec4ce1b9a 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3423,3 +3423,4 @@
 ( cvs diff -u -r 1.1.2.69 -r 1.1.2.70 src/wizard.c;  ) > 3.5.0cvs9.patchset
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpcore/select-keys.c;  ) > 3.5.0cvs10.patchset
 ( cvs diff -u -r 1.101.2.51 -r 1.101.2.52 src/news.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/news_gtk.c;  ) > 3.5.0cvs11.patchset
+( cvs diff -u -r 1.274.2.246 -r 1.274.2.247 src/mainwindow.c;  ) > 3.5.0cvs12.patchset
diff --git a/configure.ac b/configure.ac
index 3f08ee2b7..b02e50882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 996dbc652..953fe3525 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1399,6 +1399,54 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                 	gtk_window_fullscreen(GTK_WINDOW(widget));
                 }
 		break;
+	case GDK_F7:
+		{
+			PangoFontDescription *font_desc;
+			int size;
+			font_desc = pango_font_description_from_string(prefs_common.normalfont);
+			size = pango_font_description_get_size(font_desc)/PANGO_SCALE;
+			if (size < 30) {
+				size++; pango_font_description_set_size(font_desc, size*PANGO_SCALE);
+				g_free(prefs_common.normalfont); 
+				prefs_common.normalfont = pango_font_description_to_string(font_desc);
+				main_window_reflect_prefs_all();
+			}
+			pango_font_description_free(font_desc);
+			font_desc = pango_font_description_from_string(prefs_common.textfont);
+			size = pango_font_description_get_size(font_desc)/PANGO_SCALE;
+			if (size < 30) {
+				size++; pango_font_description_set_size(font_desc, size*PANGO_SCALE);
+				g_free(prefs_common.textfont); 
+				prefs_common.textfont = pango_font_description_to_string(font_desc);
+				main_window_reflect_prefs_all();
+			}
+			pango_font_description_free(font_desc);
+		}
+		break;
+	case GDK_F8:
+		{
+			PangoFontDescription *font_desc;
+			int size;
+			font_desc = pango_font_description_from_string(prefs_common.normalfont);
+			size = pango_font_description_get_size(font_desc)/PANGO_SCALE;
+			if (size > 5) {
+				size--; pango_font_description_set_size(font_desc, size*PANGO_SCALE);
+				g_free(prefs_common.normalfont); 
+				prefs_common.normalfont = pango_font_description_to_string(font_desc);
+				main_window_reflect_prefs_all();
+			}
+			pango_font_description_free(font_desc);
+			font_desc = pango_font_description_from_string(prefs_common.textfont);
+			size = pango_font_description_get_size(font_desc)/PANGO_SCALE;
+			if (size > 5) {
+				size--; pango_font_description_set_size(font_desc, size*PANGO_SCALE);
+				g_free(prefs_common.textfont); 
+				prefs_common.textfont = pango_font_description_to_string(font_desc);
+				main_window_reflect_prefs_all();
+			}
+			pango_font_description_free(font_desc);
+		}
+		break;
 	case GDK_Escape:
 		if (mainwin->summaryview && 
 		    mainwin->summaryview->ext_messageview && 
@@ -2145,7 +2193,7 @@ void main_window_reflect_tags_changes(MainWindow *mainwin)
 void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 {
 	if (prefs_tag == 0) {
-		prefs_tag = g_timeout_add(500, reflect_prefs_timeout_cb, 
+		prefs_tag = g_timeout_add(100, reflect_prefs_timeout_cb, 
 						GINT_TO_POINTER(pixmap_theme_changed));
 	}
 }