Mercurial > pidgin.yaz
diff src/aim.c @ 966:f7886476f9d9
[gaim-migrate @ 976]
yay, the applet works again (mostly)
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Tue, 10 Oct 2000 10:35:05 +0000 |
| parents | 2cd7b73e2c9a |
| children | 17ff662183b2 |
line wrap: on
line diff
--- a/src/aim.c Tue Oct 10 10:16:26 2000 +0000 +++ b/src/aim.c Tue Oct 10 10:35:05 2000 +0000 @@ -46,9 +46,7 @@ #include <stdlib.h> #include <ctype.h> #include "gaim.h" -#ifndef USE_APPLET #include "pixmaps/logo.xpm" -#endif /* USE_APPLET */ #if HAVE_SIGNAL_H #include <signal.h> #endif @@ -156,11 +154,10 @@ #ifdef USE_APPLET set_user_state(online); - applet_widget_unregister_callback(APPLET_WIDGET(applet),"signon"); applet_widget_register_callback(APPLET_WIDGET(applet), "signoff", _("Signoff"), - signoff, + (AppletCallbackFunc)signoff_all, NULL); #endif /* USE_APPLET */ @@ -189,12 +186,10 @@ GtkWidget *label; GtkWidget *table; -#ifndef USE_APPLET GtkWidget *pmw; GdkPixmap *pm; GtkStyle *style; GdkBitmap *mask; -#endif /* USE_APPLET */ if (mainwindow) { gtk_widget_show(mainwindow); @@ -293,7 +288,6 @@ gtk_widget_realize(mainwindow); -#ifndef USE_APPLET /* Logo at the top */ style = gtk_widget_get_style(mainwindow); pm = gdk_pixmap_create_from_xpm_d(mainwindow->window, &mask, @@ -303,7 +297,6 @@ gtk_widget_show(pmw); gdk_pixmap_unref(pm); gdk_bitmap_unref(mask); -#endif /* USE_APPLET */ aol_icon(mainwindow->window); @@ -316,12 +309,6 @@ SetTickerPrefs(); - /* - if((general_options & OPT_GEN_AUTO_LOGIN) && - (general_options & OPT_GEN_REMEMBER_PASS)) { - dologin(signon, NULL); - } - */ } extern void show_debug(GtkObject *); @@ -383,9 +370,9 @@ show_prefs, NULL); applet_widget_register_callback(APPLET_WIDGET(applet), - "signon", - _("Signon"), - applet_do_signon, + "accounts", + _("Accounts"), + (AppletCallbackFunc)account_editor, NULL); #ifdef GAIM_PLUGINS applet_widget_register_callback(APPLET_WIDGET(applet), @@ -395,12 +382,6 @@ NULL); #endif /* GAIM_PLUGINS */ - if((general_options & OPT_GEN_AUTO_LOGIN) && - (general_options & OPT_GEN_REMEMBER_PASS)) { - - applet_show_login(APPLET_WIDGET(applet), NULL); - } - update_pixmaps(); applet_widget_gtk_main();