gossip r2819 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Sat Jun 28 15:25:10 2008
New Revision: 2819
URL: http://svn.gnome.org/viewvc/gossip?rev=2819&view=rev

Log:
2008-06-28  Richard Hult  <richard imendio com>

	* src/gossip-preferences.c (preferences_radio_button_toggled_cb):
	Fix crash in mac port caused by setting a conf value to NULL when
	switching contact list sort critiera.


Modified:
   trunk/ChangeLog
   trunk/src/gossip-preferences.c

Modified: trunk/src/gossip-preferences.c
==============================================================================
--- trunk/src/gossip-preferences.c	(original)
+++ trunk/src/gossip-preferences.c	Sat Jun 28 15:25:10 2008
@@ -927,6 +927,16 @@
 
 			if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
 				value = enum_value->value_nick;
+			} else {
+				/* If not active, we also get a callback for
+				 * the other radio button in the group that
+				 * has the right value, so ignore this.
+				 */
+				/* FIXME: Note that this hardcoding of keys
+				 * if not how I meant this code to be used
+				 * at all, should be fixed at some point.
+				 */
+				return;
 			}
 		} else if (strcmp (key, GOSSIP_PREFS_CHAT_THEME_USE_SYSTEM_FONT) == 0) {
 			if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {