[Ayttm-commits] CVS: ayttm/src away_window.c,1.15,1.16 chat_room.c,1.55,1.56 dialog.c,1.20,1.21 edit_account_window.c,1.13,1.14prefs_window.c,1.4,1.5

[Colin Leroy <address@hidden>]

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

Modified Files:
        away_window.c chat_room.c dialog.c edit_account_window.c 
        prefs_window.c 
Log Message:
remove code duplication


Index: away_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/away_window.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- away_window.c       22 Mar 2003 11:48:25 -0000      1.15
+++ away_window.c       22 Mar 2003 12:39:29 -0000      1.16
@@ -284,9 +284,6 @@
                GtkWidget * table;
                GtkWidget * separator;
                GtkWidget * button;
-               GtkWidget * iconwid;
-               GdkPixmap * icon;
-               GdkBitmap * mask;
 
                away_window = gtk_window_new(GTK_WINDOW_DIALOG);
                gtk_window_set_position(GTK_WINDOW(away_window), 
GTK_WIN_POS_MOUSE);
@@ -341,56 +338,26 @@
 
                /* 'Set away' and 'Cancel' buttons go here */
 
-               hbox = gtk_hbox_new(FALSE, 5);
                hbox2 = gtk_hbox_new(TRUE, 5);
 
                gtk_widget_set_usize(hbox2, 200, 25);
 
                /* put in the pixmap and label for the 'Set away' button */
 
-               icon = gdk_pixmap_create_from_xpm_d(away_window->window, &mask, 
NULL, ok_xpm);
-               iconwid = gtk_pixmap_new(icon, mask);
-               label = gtk_label_new(_("Set Away"));
-
-               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-               gtk_widget_show(iconwid);
-               gtk_widget_show(label);
-
-               button = gtk_button_new();
+               button = do_icon_button(_("Set away"), ok_xpm, away_window);
 
                gtk_signal_connect(GTK_OBJECT(button), "clicked",
                                GTK_SIGNAL_FUNC(ok_callback), NULL);
 
-               gtk_widget_show(hbox);
-
-               gtk_container_add(GTK_CONTAINER(button), hbox);
                gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
                gtk_widget_show(button);
 
                /* now start on the cancel button */
 
-               hbox = gtk_hbox_new(FALSE, 5);
-
-               icon = gdk_pixmap_create_from_xpm_d(away_window->window, &mask, 
NULL, cancel_xpm);
-               iconwid = gtk_pixmap_new(icon, mask);
-               label = gtk_label_new(_("Cancel"));
-
-               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-               gtk_widget_show(iconwid);
-               gtk_widget_show(label);
-
-               button = gtk_button_new();
+               button = do_icon_button(_("Cancel"), cancel_xpm, away_window);
 
                gtk_signal_connect(GTK_OBJECT(button), "clicked",
                                GTK_SIGNAL_FUNC(cancel_callback), NULL);
-
-               gtk_widget_show(hbox);
-
-               gtk_container_add(GTK_CONTAINER(button), hbox);
 
                gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
                gtk_widget_show(button);

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- chat_room.c 16 Mar 2003 12:57:27 -0000      1.55
+++ chat_room.c 22 Mar 2003 12:39:29 -0000      1.56
@@ -419,10 +419,7 @@
        GtkWidget * hbox;
        GtkWidget * hbox2;
        GtkWidget * button;
-       GtkWidget * iconwid;
        GtkWidget * separator;
-       GdkPixmap * icon;
-       GdkBitmap * mask;
        GList * list;
 
        if(join_service_is_open)
@@ -495,57 +492,28 @@
        
        /* Add in the pretty buttons with pixmaps on them */
 
-       hbox = gtk_hbox_new(FALSE, 5);
        hbox2 = gtk_hbox_new(TRUE, 5);
 
        gtk_widget_set_usize(hbox2, 200, 25);
        
        /* stuff for the join button */
        
-       icon = gdk_pixmap_create_from_xpm_d(join_chat_window->window, &mask, 
NULL, ok_xpm);
-       iconwid = gtk_pixmap_new(icon, mask);
-       label = gtk_label_new(_("Join"));
-                                                       
-       gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2); 
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-       
-       gtk_widget_show(iconwid);
-       gtk_widget_show(label);
-
-       button = gtk_button_new();
+       button = do_icon_button(_("Join"),ok_xpm, join_chat_window);
 
        gtk_signal_connect(GTK_OBJECT(button), "clicked",
                                        GTK_SIGNAL_FUNC(join_chat_callback),
                                        NULL);
-       gtk_widget_show(hbox);
 
-       gtk_container_add(GTK_CONTAINER(button), hbox);
        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);
-       
-       icon = gdk_pixmap_create_from_xpm_d(join_chat_window->window, &mask, 
NULL, cancel_xpm);
-       iconwid = gtk_pixmap_new(icon, mask);
-       label = gtk_label_new(_("Cancel"));
-
-       gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2); 
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-       gtk_widget_show(iconwid);
-       gtk_widget_show(label);
-
-       button = gtk_button_new();
+       button = do_icon_button(_("Cancel"), cancel_xpm, join_chat_window);
 
        gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
                                                
GTK_SIGNAL_FUNC(gtk_widget_destroy),
                                                GTK_OBJECT(join_chat_window));
-       gtk_widget_show(hbox);
-
-       gtk_container_add(GTK_CONTAINER(button), hbox);
-
        gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
        gtk_widget_show(button);
 

Index: dialog.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dialog.c    22 Mar 2003 12:06:58 -0000      1.20
+++ dialog.c    22 Mar 2003 12:39:29 -0000      1.21
@@ -462,10 +462,6 @@
        GtkWidget * hbox;
        GtkWidget * hbox2;
        GtkWidget * separator;
-       GtkWidget * iconwid;
-       GdkPixmap * icon;
-       GdkBitmap * mask;
-       GtkWidget * label;
        GtkWidget * button;
 
        text_input_window * input_window = g_new0(text_input_window, 1);
@@ -497,22 +493,11 @@
        gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 5);
        gtk_widget_show(separator);
 
-       hbox = gtk_hbox_new(FALSE, 5);
        hbox2 = gtk_hbox_new(TRUE, 5);
 
        gtk_widget_set_usize(hbox2, 100,25);
 
-       icon = gdk_pixmap_create_from_xpm_d(input_window->window->window, 
&mask, NULL, ok_xpm);
-       iconwid = gtk_pixmap_new(icon, mask);
-       label = gtk_label_new(_("OK"));
-            
-       gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-            
-       gtk_widget_show(iconwid);
-       gtk_widget_show(label);
-            
-       button = gtk_button_new();
+       button = do_icon_button(_("OK"), ok_xpm, input_window->window);
             
        gtk_signal_connect(GTK_OBJECT(button), "clicked", input_window_ok,
                        input_window);
@@ -520,9 +505,6 @@
        gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
                                  GTK_SIGNAL_FUNC(gtk_widget_destroy),
                                  GTK_OBJECT(input_window->window));
-            
-       gtk_container_add(GTK_CONTAINER (button), hbox);                
-       gtk_widget_show(hbox);     
             
        gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
        gtk_widget_show(button);

Index: edit_account_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_account_window.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- edit_account_window.c       17 Mar 2003 18:17:08 -0000      1.13
+++ edit_account_window.c       22 Mar 2003 12:39:29 -0000      1.14
@@ -129,13 +129,10 @@
                GtkWidget *hbox2;
                GtkWidget *label;
                GtkWidget *button;
-               GtkWidget *iconwid;
                GtkWidget *table;
                GtkWidget *separator;
                GList *list;
-               GdkPixmap *icon;
-               GdkBitmap *mask;        
-
+               
                edit_account_window = gtk_window_new(GTK_WINDOW_DIALOG);
                gtk_window_set_position(GTK_WINDOW(edit_account_window), 
GTK_WIN_POS_MOUSE);
                gtk_widget_realize(edit_account_window);
@@ -205,48 +202,21 @@
 
                /*Add Button*/
 
-               icon = 
gdk_pixmap_create_from_xpm_d(edit_account_window->window, &mask, NULL, 
tb_preferences_xpm);
-               iconwid = gtk_pixmap_new(icon, mask);
-               label = gtk_label_new(add_label);
-
-               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-               gtk_widget_show(iconwid);
-               gtk_widget_show(label);
-
-               button = gtk_button_new();
-
+               button = do_icon_button(add_label,tb_preferences_xpm, 
edit_account_window);
+               
                gtk_signal_connect(GTK_OBJECT(button), "clicked",
                                GTK_SIGNAL_FUNC(ok_callback), NULL);
-               gtk_widget_show(hbox);
-
-               gtk_container_add(GTK_CONTAINER (button), hbox);
 
                gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
                gtk_widget_show(button);
 
                /*Cancel Button*/
 
-               hbox = gtk_hbox_new(FALSE, 5);
-               icon = 
gdk_pixmap_create_from_xpm_d(edit_account_window->window, &mask, NULL, 
cancel_xpm);
-               iconwid = gtk_pixmap_new(icon, mask);
-               label = gtk_label_new(_("Cancel"));
-
-               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-               gtk_widget_show(iconwid);
-               gtk_widget_show(label);
-
-               button = gtk_button_new();
-
+               button = do_icon_button(_("Cancel"),cancel_xpm, 
edit_account_window);
+               
                gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
                                GTK_SIGNAL_FUNC(gtk_widget_destroy),
                                GTK_OBJECT(edit_account_window));
-               gtk_widget_show(hbox);
-
-               gtk_container_add(GTK_CONTAINER (button), hbox);
 
                gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
                gtk_widget_show(button);

Index: prefs_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs_window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prefs_window.c      16 Mar 2003 15:05:01 -0000      1.4
+++ prefs_window.c      22 Mar 2003 12:39:29 -0000      1.5
@@ -84,9 +84,6 @@
          GtkWidget *button;
          GtkWidget *hbox2;
          GtkWidget *prefs_vbox;
-         GtkWidget *iconwid;
-         GdkPixmap *icon;
-         GdkBitmap *mask;
          GtkWidget *prefs_window;
 
          prefs_vbox = gtk_vbox_new(FALSE, 5);
@@ -127,21 +124,10 @@
          }
 
          /*Okay Button*/
-         hbox = gtk_hbox_new(FALSE, 5);
          hbox2 = gtk_hbox_new(TRUE, 5);
          gtk_widget_set_usize(hbox2, 200,25);
 
-         icon = gdk_pixmap_create_from_xpm_d(prefs_window->window, &mask, 
NULL, ok_xpm);
-         iconwid = gtk_pixmap_new(icon, mask);
-         label = gtk_label_new(_("Ok"));
-
-         gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-         gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-         gtk_widget_show(iconwid);
-         gtk_widget_show(label);
-
-         button = gtk_button_new();
+         button = do_icon_button(_("OK"), ok_xpm, prefs_window);
 
          gtk_signal_connect(GTK_OBJECT(button), "clicked", 
                             ok_callback, prefs_window);
@@ -149,26 +135,12 @@
          gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
                                     GTK_SIGNAL_FUNC (gtk_widget_destroy),
                                     GTK_OBJECT (prefs_window));
-         gtk_widget_show(hbox);
-
-         gtk_container_add (GTK_CONTAINER (button), hbox);
-
          gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 5);
          gtk_widget_show(button);
 
          /*Cancel Button*/
-         hbox = gtk_hbox_new(FALSE, 5);
-         icon = gdk_pixmap_create_from_xpm_d(prefs_window->window, &mask, 
NULL, cancel_xpm);
-         iconwid = gtk_pixmap_new(icon, mask);
-         label = gtk_label_new(_("Cancel"));
-
-         gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-         gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
 
-         gtk_widget_show(iconwid);
-         gtk_widget_show(label);
-
-         button = gtk_button_new();
+         button = do_icon_button(_("Cancel"), cancel_xpm, prefs_window);
 
          gtk_signal_connect(GTK_OBJECT(button), "clicked", 
                             cancel_callback, prefs_window);
@@ -176,9 +148,6 @@
          gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
                                     GTK_SIGNAL_FUNC (gtk_widget_destroy),
                                     GTK_OBJECT (prefs_window));
-         gtk_widget_show(hbox);
-
-         gtk_container_add (GTK_CONTAINER (button), hbox);
 
          gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 5);
          gtk_widget_show(button);