devhelp r1240 - in trunk: . po src

[rhult svn gnome org]

Author: rhult
Date: Mon Dec  1 16:02:17 2008
New Revision: 1240
URL: http://svn.gnome.org/viewvc/devhelp?rev=1240&view=rev

Log:
2008-12-01  Richard Hult  <richard imendio com>

	* NEWS: Update for 0.22 release.

	* src/dh-preferences.c: (preferences_system_fonts_toggled_cb),
	(preferences_connect_conf_listeners): Fix build with recent gcc
	versions.

	* src/dh-util.c: (dh_util_font_get_variable), (font_notify_cb):
	Fix the font size and remove debug output.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/po/ChangeLog
   trunk/src/dh-preferences.c
   trunk/src/dh-util.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Dec  1 16:02:17 2008
@@ -1,3 +1,26 @@
+NEW in 0.22:
+============
+
+This is the first release from the WebKit branch. Many thanks to Alp
+Toker, Frederic Peters and Jan Alonzo for the initial patches.
+
+Updated translations: ar, be latin, bg, bn_IN, ca, cs, da, de, en_GB,
+es, et, fi, fr, gl, he, hr, hu, it, ja, ko, lt, mk, nb, ne, nl, nn,
+oc, pl, ps, pt, pt_BR, ru, sq, sv, th, tr, uk, vi, zh_TW
+
+Many thanks to the translators: Alexander Shopov, Arangel Angov, Artur
+Flinta, Baris Cicek, Changwoo Ryu, Claude Paroz, Clytie Siddall,
+Daniel Nylander, David Lodge, Djihed Afifi, Duarte Loreto, Eskild
+Hustvedt, Gabor Kelemen, Gil Forcada, Gintautas Miliauskas, Hong Kong,
+Ignacio Casal Quinteiro, Ihar Hrachyshka, Ilkka Tuohela, Jonh Wendell,
+Jorge Gonzalez, Jovan Naumovski, Kenneth Nielsen, Kjartan Maraas,
+Laurent Dhima, Leonardo Ferreira Fontenelle, Luca Ferretti, Maxim
+Dziumanenko, Pawan Chitrakar, Petr Kovar, Philipp Kerling, Priit Laes,
+Richard Hult, Robert Sedak, Runa Bhattacharjee, Takeshi AIHANA,
+Theppitak Karoonboonyanan, Wouter Bolsterlee, Yair Hershkovitz, Yannig
+Marchegay, Yuri Kozlov.
+
+
 NEW in 0.19:
 ============
 

Modified: trunk/src/dh-preferences.c
==============================================================================
--- trunk/src/dh-preferences.c	(original)
+++ trunk/src/dh-preferences.c	Mon Dec  1 16:02:17 2008
@@ -47,6 +47,7 @@
                                                        gpointer          user_data);
 static void     preferences_system_fonts_toggled_cb   (GtkToggleButton  *button,
                                                        gpointer          user_data);
+#if 0
 static void     preferences_var_font_notify_cb        (IgeConf          *client,
                                                        const gchar      *path,
                                                        gpointer          user_data);
@@ -57,6 +58,7 @@
                                                        const gchar      *path,
                                                        gpointer          user_data);
 static void     preferences_connect_conf_listeners    (void);
+#endif
 static void     preferences_get_font_names            (gboolean          use_system_fonts,
                                                        gchar           **variable,
                                                        gchar           **fixed);
@@ -126,6 +128,7 @@
 	gtk_widget_set_sensitive (prefs->fonts_table, !active);
 }
 
+#if 0
 static void
 preferences_var_font_notify_cb (IgeConf     *client,
 				const gchar *path,
@@ -196,8 +199,6 @@
 {
 	IgeConf *conf;
 
-        if (0) preferences_connect_conf_listeners ();
-	
 	conf = ige_conf_get ();
 
 	prefs->use_system_fonts_id =
@@ -226,6 +227,7 @@
                                      preferences_fixed_font_notify_cb,
                                      prefs);
 }
+#endif
 
 /* FIXME: Use the functions in dh-util.c for this. */
 static void

Modified: trunk/src/dh-util.c
==============================================================================
--- trunk/src/dh-util.c	(original)
+++ trunk/src/dh-util.c	Mon Dec  1 16:02:17 2008
@@ -608,7 +608,7 @@
                                      &name_and_size);
 	}
 
-        if (split_font_string (name_and_size, name, size)) {
+        if (!split_font_string (name_and_size, name, size)) {
                 *name = g_strdup ("sans");
                 *size = 12;
         }
@@ -695,8 +695,6 @@
 {
         GList *l;
 
-        g_print ("fonts changed\n");
-
         for (l = views; l; l = l->next) {
                 view_setup_fonts (l->data);
         }