[Ayttm-commits] CVS: ayttm/src about.c,1.8,1.9 away_window.c,1.5,1.6 chat_room.c,1.10,1.11 dialog.c,1.5,1.6 edit_group_window.c,1.4,1.5 editcontacts.c,1.10,1.11 util.c,1.5,1.6

[Colin Leroy <address@hidden>]

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

Modified Files:
        about.c away_window.c chat_room.c dialog.c edit_group_window.c 
        editcontacts.c util.c 
Log Message:
try to set default focuses a bit better


Index: about.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/about.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- about.c     9 Jan 2003 01:02:54 -0000       1.8
+++ about.c     9 Jan 2003 09:20:21 -0000       1.9
@@ -208,5 +208,7 @@
        gtk_container_add(GTK_CONTAINER(sAboutWindow), GTK_WIDGET(vbox));
 
        gtk_widget_show(sAboutWindow);
+       gtk_window_set_focus(GTK_WINDOW(sAboutWindow), ok);
+
 }
 

Index: away_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/away_window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- away_window.c       8 Jan 2003 01:55:19 -0000       1.5
+++ away_window.c       9 Jan 2003 09:20:22 -0000       1.6
@@ -218,6 +218,15 @@
        gchar buff[2048];
 
        strcpy(buff, gtk_entry_get_text(GTK_ENTRY(title)));
+       strcpy(buff, gtk_entry_get_text(GTK_ENTRY(away_message)));
+
+       if (!buff || strlen(buff) == 0) {
+               strcpy(buff, gtk_entry_get_text(GTK_ENTRY(away_message)));
+       }
+       if (!buff || strlen(buff) == 0) {
+               do_error_dialog (_("Enter at least a message.\n"),_("Error"));
+               return;
+       }
        g_string_append(a_title, buff); 
 
        strcpy(buff, gtk_entry_get_text(GTK_ENTRY(away_message)));
@@ -380,6 +389,8 @@
                gtk_window_set_policy(GTK_WINDOW(away_window), FALSE, FALSE, 
TRUE);             
                
                gtk_widget_show(away_window);
+               gtk_window_set_focus(GTK_WINDOW(away_window), title);
+
        }
 
        gtk_window_set_title(GTK_WINDOW(away_window), _("New Away Message"));

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- chat_room.c 9 Jan 2003 08:42:40 -0000       1.10
+++ chat_room.c 9 Jan 2003 09:20:22 -0000       1.11
@@ -240,7 +240,8 @@
        /* Window resize BAD, Same size GOOD */
 
        gtk_window_set_policy (GTK_WINDOW(join_chat_window), FALSE, FALSE, 
TRUE);
-
+       gtk_window_set_position(GTK_WINDOW(join_chat_window), 
GTK_WIN_POS_MOUSE);
+       
        /* Show the frame and window */
        
        gtk_widget_show(frame);
@@ -281,7 +282,6 @@
        gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
        gtk_widget_show(button);
        
-       
        /* stuff for the cancel button */
 
        hbox = gtk_hbox_new(FALSE, 5);
@@ -323,6 +323,8 @@
 
        gtk_widget_show(join_chat_window);
 
+       gtk_window_set_focus(GTK_WINDOW(join_chat_window), chat_room_name);
+       
        gtk_signal_connect( GTK_OBJECT(join_chat_window), "destroy",
                                GTK_SIGNAL_FUNC(join_chat_destroy), NULL );
 }
@@ -729,6 +731,7 @@
        }
        
        RUN_SERVICE(chat_room->chat_room_account)->join_chat_room(chat_room);
+       gtk_window_set_focus(GTK_WINDOW(chat_room->window), chat_room->entry);
 
 }
 

Index: dialog.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dialog.c    8 Jan 2003 01:55:19 -0000       1.5
+++ dialog.c    9 Jan 2003 09:20:22 -0000       1.6
@@ -344,15 +344,6 @@
 
 
     d = gtk_dialog_new();
-    /* if parent is not main window, set it.
-     * This prevents this dialog from popping up 'underneath' another
-     * dialog to which it applies
-     */
-    /*if(current_parent_widget)
-    {
-       gtk_window_set_transient_for(GTK_WINDOW(d),
-                                    GTK_WINDOW(current_parent_widget));
-    }*/
     label = gtk_label_new(message);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     gtk_widget_show(label);
@@ -369,8 +360,9 @@
     gtk_window_set_position(GTK_WINDOW(d), GTK_WIN_POS_MOUSE);
     gtk_signal_connect_object(GTK_OBJECT(close), "clicked", 
GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(d));
        gtk_window_set_modal(GTK_WINDOW(d), TRUE);
-
     gtk_widget_show(d);
+    gtk_window_set_focus(GTK_WINDOW(d), close);
+
     return d;
 }
 

Index: edit_group_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_group_window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- edit_group_window.c 3 Jan 2003 23:26:07 -0000       1.4
+++ edit_group_window.c 9 Jan 2003 09:20:22 -0000       1.5
@@ -132,5 +132,7 @@
 
        current_group = g;
        window_open = 1;
+       gtk_window_set_focus(GTK_WINDOW(edit_group_window), group_name);
+       
 }
 

Index: editcontacts.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/editcontacts.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- editcontacts.c      9 Jan 2003 08:42:40 -0000       1.10
+++ editcontacts.c      9 Jan 2003 09:20:22 -0000       1.11
@@ -524,4 +524,6 @@
        gtk_signal_connect(GTK_OBJECT(account_window), "destroy",
                                           GTK_SIGNAL_FUNC(destroy), NULL );
        gtk_widget_show(account_window);
+       gtk_window_set_focus(GTK_WINDOW(account_window), username);
+
 }

Index: util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- util.c      9 Jan 2003 00:50:50 -0000       1.5
+++ util.c      9 Jan 2003 09:20:22 -0000       1.6
@@ -610,7 +610,7 @@
 }
 
 eb_local_account * find_suitable_local_account( eb_local_account * first,
-                                                                               
                gint second )
+                                               gint second )
 {
        GList * node;
        GList * states;