[Ayttm-commits] CVS: ayttm/src prefs_window.c,1.5.2.2,1.5.2.3

[Andy Maloney <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv10390/src

Modified Files:
      Tag: new_prefs
        prefs_window.c 
Log Message:
Fix tab chat prefs due to weird GTK behaviour

Index: prefs_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs_window.c,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- prefs_window.c      23 Mar 2003 11:41:57 -0000      1.5.2.2
+++ prefs_window.c      23 Mar 2003 12:22:58 -0000      1.5.2.3
@@ -397,15 +397,16 @@
 
 static void build_layout_prefs(GtkWidget *prefs_note) 
 {
-     GtkWidget *vbox = NULL;
-     GtkWidget *hbox = NULL;
-     GSList            *group = NULL;
-     GtkWidget *label = NULL;
+       GtkWidget       *vbox = NULL;
+       GtkWidget       *hbox = NULL;
+       GSList          *group = NULL;
+       GtkWidget       *label = NULL;
+       int                     save_orientation = 0;
 
      vbox = gtk_vbox_new(FALSE, 5);
 
      /* Values */
-     eb_button(_("Use tabbed chat-windows"), &s_prefs.layout.do_tabbed_chat, 
vbox);
+     eb_button(_("Use tabs in chat windows"), &s_prefs.layout.do_tabbed_chat, 
vbox);
 
      /*
        Radio button group for tabbed chat orientation
@@ -415,13 +416,16 @@
      hbox = gtk_hbox_new(FALSE, 5);
 
      /* setup intro label */
-     label = gtk_label_new (_("Tabs position:"));
+     label = gtk_label_new (_("Tab position:"));
      gtk_widget_show (label);
      gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 5);
-
-     /* Setup group -- set to NULL to create new group */
-     group = NULL;
-
+        
+        /* Because it seems that the 'clicked' function is called when we 
create the second radio button [!],
+               we must save our current value and restore it after the 
creation of the radio buttons
+       */
+       
+       save_orientation = s_prefs.layout.do_tabbed_chat_orient;
+       
      /* Create buttons */
      group = eb_radio (group, _("Bottom"), 
s_prefs.layout.do_tabbed_chat_orient, 0, hbox,
                       set_tco_element);
@@ -432,6 +436,8 @@
      group = eb_radio (group, _("Right"),  
s_prefs.layout.do_tabbed_chat_orient, 3, hbox,
                       set_tco_element);
 
+       s_prefs.layout.do_tabbed_chat_orient = save_orientation;
+       
      /* Put it in the vbox and make it visible */
      gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
      gtk_widget_show (hbox);
@@ -448,13 +454,7 @@
 /*
  * Chat Preferences Tab
  */
-/*
-GdkDeviceKey accel_prev_tab = { GDK_Left, GDK_CONTROL_MASK };
-GdkDeviceKey accel_next_tab = { GDK_Right, GDK_CONTROL_MASK };
 
-static GdkDeviceKey accel_prev_tab_old = { GDK_Left, GDK_CONTROL_MASK };
-static GdkDeviceKey accel_next_tab_old = { GDK_Right, GDK_CONTROL_MASK };
-*/
 static GdkDeviceKey    local_accel_prev_tab;
 static GdkDeviceKey    local_accel_next_tab;
 
@@ -536,7 +536,7 @@
 
      label = gtk_label_new (labelString);
      gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 3);
-     gtk_widget_set_usize(label, 255, 10);
+     gtk_widget_set_usize(label, 275, 10);
         gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
      gtk_widget_show (label);