Mercurial > pidgin.yaz
changeset 622:7f8b85e2e894
[gaim-migrate @ 632]
Let's go back to this until I figure out what I want to do with the user interface.
committer: Tailor Script <tailor@pidgin.im>
| author | Rob Flynn <gaim@robflynn.com> |
|---|---|
| date | Sun, 06 Aug 2000 03:35:17 +0000 |
| parents | 991bf4e3c9fe |
| children | 83b0caceea9a |
| files | src/about.c src/aim.c |
| diffstat | 2 files changed, 9 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/about.c Sat Aug 05 21:54:36 2000 +0000 +++ b/src/about.c Sun Aug 06 03:35:17 2000 +0000 @@ -116,8 +116,9 @@ gtk_signal_connect(GTK_OBJECT(eventbox), "button_press_event", GTK_SIGNAL_FUNC(about_click), NULL); gdk_window_set_cursor(eventbox->window, gdk_cursor_new(GDK_HAND2)); - - button = picture_button(about, _("Close"), gnome_close_xpm); + + button = gtk_button_new_with_label("Close"); + if (null == NULL) /* there's a mindtrip */ gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
--- a/src/aim.c Sat Aug 05 21:54:36 2000 +0000 +++ b/src/aim.c Sun Aug 06 03:35:17 2000 +0000 @@ -48,11 +48,6 @@ #include "gaim.h" #ifndef USE_APPLET #include "pixmaps/logo.xpm" -#include "pixmaps/gnome_preferences.xpm" -#include "pixmaps/join.xpm" -#include "pixmaps/cancel.xpm" -#include "pixmaps/plugins.xpm" -#include "pixmaps/register.xpm" #endif /* USE_APPLET */ #if HAVE_SIGNAL_H #include <signal.h> @@ -331,7 +326,6 @@ GtkWidget *reg; GtkWidget *bbox; GtkWidget *hbox; - GtkWidget *rbox; GtkWidget *sbox; GtkWidget *label; GtkWidget *table; @@ -351,12 +345,12 @@ mainwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_widget_realize(mainwindow); - signon = picture_button(mainwindow, _("Signon"), join_xpm); - cancel = picture_button(mainwindow, _("Cancel"), cancel_xpm); - reg = picture_button(mainwindow, _("Create Account"), register_xpm); - options = picture_button(mainwindow, _("Options"), gnome_preferences_xpm); + signon = gtk_button_new_with_label(_("Signon")); + cancel = gtk_button_new_with_label(_("Cancel")); + reg = gtk_button_new_with_label(_("Register")); + options = gtk_button_new_with_label(_("Options")); #ifdef GAIM_PLUGINS - plugs = picture_button(mainwindow, _("Plugins"), plugins_xpm); + plugs = gtk_button_new_with_label(_("Plugins")); #endif table = gtk_table_new(8, 2, FALSE); name = gtk_combo_new(); @@ -410,10 +404,9 @@ /* Homogenous spacing, 10 padding */ bbox = gtk_hbox_new(TRUE, 10); hbox = gtk_hbox_new(TRUE, 10); - rbox = gtk_hbox_new(TRUE, 10); sbox = gtk_vbox_new(TRUE, 5); - gtk_box_pack_start(GTK_BOX(rbox), reg, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(bbox), reg, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(bbox), signon, TRUE, TRUE, 0); @@ -424,7 +417,6 @@ gtk_box_pack_start(GTK_BOX(sbox), bbox, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(sbox), hbox, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(sbox), rbox, TRUE, TRUE, 0); /* Labels for selectors and text boxes */ #if 0 @@ -469,7 +461,6 @@ gtk_widget_show(reg); gtk_widget_show(bbox); gtk_widget_show(hbox); - gtk_widget_show(rbox); gtk_widget_show(sbox); gtk_table_attach(GTK_TABLE(table), sbox, 0,2,7,8,0,0, 5, 5);