Mercurial > pidgin.yaz
changeset 1123:bc718030af96
[gaim-migrate @ 1133]
mods to applet
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Wed, 22 Nov 2000 10:39:53 +0000 |
| parents | 889ca2b8697b |
| children | a70d5200edde |
| files | src/gnome_applet_mgr.c src/prefs.c |
| diffstat | 2 files changed, 4 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gnome_applet_mgr.c Wed Nov 22 07:01:07 2000 +0000 +++ b/src/gnome_applet_mgr.c Wed Nov 22 10:39:53 2000 +0000 @@ -390,13 +390,14 @@ icon=gtk_pixmap_new(icon_offline_pm,icon_offline_bm); - update_applet(); - vbox = gtk_vbox_new(FALSE,0); gtk_box_pack_start(GTK_BOX(vbox), icon, FALSE, TRUE, 0); status_label = gtk_label_new(_("Offline")); + + update_applet(); + /*set this label's font*/ label_style = gtk_widget_get_style( status_label );
--- a/src/prefs.c Wed Nov 22 07:01:07 2000 +0000 +++ b/src/prefs.c Wed Nov 22 10:39:53 2000 +0000 @@ -34,7 +34,6 @@ #include <stdarg.h> #include <gtk/gtk.h> #include "gaim.h" -#include "gnome_applet_mgr.h" #include "pixmaps/cancel.xpm" #include "pixmaps/fontface2.xpm" #include "pixmaps/refresh.xpm" @@ -50,9 +49,6 @@ static GtkWidget *gaim_button(const char *, int *, int, GtkWidget *); static void prefs_build_general(GtkWidget *); -#ifdef USE_APPLET -static void prefs_build_applet(GtkWidget *); -#endif static void prefs_build_buddy(GtkWidget *); static void prefs_build_convo(GtkWidget *); static void prefs_build_sound(GtkWidget *); @@ -156,34 +152,6 @@ gtk_widget_show(prefdialog); } -#ifdef USE_APPLET -static void applet_page() -{ - GtkWidget *parent; - GtkWidget *box; - GtkWidget *label; - GtkWidget *sep; - - parent = prefdialog->parent; - gtk_widget_destroy(prefdialog); - - prefdialog = gtk_frame_new(_("Applet Options")); - gtk_container_add(GTK_CONTAINER(parent), prefdialog); - - box = gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(prefdialog), box); - gtk_widget_show(box); - - label = gtk_label_new(_("All options take effect immediately unless otherwise noted.")); - gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5); - gtk_widget_show(label); - - gaim_button(_("Display Buddy List near applet"), &general_options, OPT_GEN_NEAR_APPLET, box); - - gtk_widget_show(prefdialog); -} -#endif - static void buddy_page() { GtkWidget *parent; @@ -224,6 +192,7 @@ gaim_button(_("Save Window Size/Position"), &general_options, OPT_GEN_SAVED_WINDOWS, box); #ifdef USE_APPLET gaim_button(_("Automatically show buddy list on sign on"), &general_options, OPT_GEN_APP_BUDDY_SHOW, box); + gaim_button(_("Display Buddy List near applet"), &general_options, OPT_GEN_NEAR_APPLET, box); #endif gtk_widget_show(prefdialog); @@ -1445,9 +1414,6 @@ gtk_widget_show(prefdialog); prefs_build_general(preftree); -#ifdef USE_APPLET - prefs_build_applet(preftree); -#endif prefs_build_buddy(preftree); prefs_build_convo(preftree); prefs_build_sound(preftree); @@ -1663,19 +1629,6 @@ gtk_ctree_select(GTK_CTREE(preftree), parent); } -#ifdef USE_APPLET -void prefs_build_applet(GtkWidget *preftree) -{ - GtkCTreeNode *parent, *node; - char *text[1]; - - text[0] = _("Applet"); - parent = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL, - text, 5, NULL, NULL, NULL, NULL, 0, 1); - gtk_ctree_node_set_row_data(GTK_CTREE(preftree), parent, applet_page); -} -#endif - void prefs_build_buddy(GtkWidget *preftree) { GtkCTreeNode *parent;