# HG changeset patch # User Eric Warmenhoven # Date 971174105 0 # Node ID f7886476f9d97404569e2feefcf74e0deeab0b3c # Parent 50f2977537d8fc4d2062fe274ebe822076893ac1 [gaim-migrate @ 976] yay, the applet works again (mostly) committer: Tailor Script diff -r 50f2977537d8 -r f7886476f9d9 FIXME --- a/FIXME Tue Oct 10 10:16:26 2000 +0000 +++ b/FIXME Tue Oct 10 10:35:05 2000 +0000 @@ -16,12 +16,7 @@ 4. We need to modify nearly every function in server.c to determine which connection to do things on. The ones that still need to be modified have a FIXME comment in them. 4.1. We need to modify the UI to let the user indicate which account to do things on. - 4.2. We need to decide when people are idle. Right now it's possible to have been idle for 10 minutes - but only signed on for one. DONE 5. We need to completely modify the plugin/perl system to account for multiple connections. 6. We need to modify functions to account for the possibility of protocol plugins. -7. Get rid of dologin. Signons should be handled differently. The account editor should have final - control over this. DONE -8. I seriously doubt the applet will compile. If it compiles it definitely won't run. And that's just the large things. There are countless trivial issues that need to be addressed. diff -r 50f2977537d8 -r f7886476f9d9 STATUS --- a/STATUS Tue Oct 10 10:16:26 2000 +0000 +++ b/STATUS Tue Oct 10 10:35:05 2000 +0000 @@ -1,4 +1,4 @@ -STATUS of GAIM CVS tree. Last modified $Date: 2000-10-09 20:02:02 -0400 (Mon, 09 Oct 2000) $ by $Author: warmenhoven $. +STATUS of GAIM CVS tree. Last modified $Date: 2000-10-10 06:35:05 -0400 (Tue, 10 Oct 2000) $ by $Author: warmenhoven $. This file is meant to provide gaim users who use the CVS version to see whether the actually want to compile what they just checked out. Gaim CVS is usually @@ -59,11 +59,10 @@ Applet ====== -I'll be amazed if the applet compiles. If it compiles, I'll be amazed if it -doesn't segfault. But technically nothing drastic changed with the applet in -The Change, so it may end up working just fine. I don't have the time nor the -energy to test it right now though; I'll come back to it as soon as the app is -stabilized. +The applet made a comeback sooner than I expected, mostly because I got chat +working. (This means that I'll be using current CVS as my "permanent" gaim, +and I prefer having gaim as an applet.) Anyway, the UI is still shakey (as is +the rest of gaim) but it is at least functional now. Plugins/Perl diff -r 50f2977537d8 -r f7886476f9d9 src/aim.c --- 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 #include #include "gaim.h" -#ifndef USE_APPLET #include "pixmaps/logo.xpm" -#endif /* USE_APPLET */ #if HAVE_SIGNAL_H #include #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(); diff -r 50f2977537d8 -r f7886476f9d9 src/buddy.c --- a/src/buddy.c Tue Oct 10 10:16:26 2000 +0000 +++ b/src/buddy.c Tue Oct 10 10:35:05 2000 +0000 @@ -275,7 +275,7 @@ #endif -static void signoff_all(GtkWidget *w, gpointer d) +void signoff_all(GtkWidget *w, gpointer d) { GSList *c = connections; struct gaim_connection *g = NULL; @@ -316,11 +316,6 @@ applet_buddy_show = FALSE; applet_widget_unregister_callback(APPLET_WIDGET(applet),"signoff"); remove_applet_away(); - applet_widget_register_callback(APPLET_WIDGET(applet), - "signon", - _("Signon"), - applet_do_signon, - NULL); #else show_login(); #endif /* USE_APPLET */ diff -r 50f2977537d8 -r f7886476f9d9 src/gaim.h --- a/src/gaim.h Tue Oct 10 10:16:26 2000 +0000 +++ b/src/gaim.h Tue Oct 10 10:35:05 2000 +0000 @@ -724,6 +724,7 @@ extern void refresh_buddy_window(); extern void toc_build_config(char *, int len, gboolean); extern void signoff(struct gaim_connection *); +extern void signoff_all(GtkWidget *, gpointer); extern void do_im_back(); extern void set_buddy(struct buddy *); extern struct person *add_person(char *, char *); diff -r 50f2977537d8 -r f7886476f9d9 src/gnome_applet_mgr.c --- a/src/gnome_applet_mgr.c Tue Oct 10 10:16:26 2000 +0000 +++ b/src/gnome_applet_mgr.c Tue Oct 10 10:35:05 2000 +0000 @@ -181,8 +181,6 @@ void applet_do_signon(AppletWidget *widget, gpointer data) { applet_show_login(NULL, 0); - if (general_options & OPT_GEN_REMEMBER_PASS) - dologin(0, 0); } void insert_applet_away() { diff -r 50f2977537d8 -r f7886476f9d9 src/multi.c --- a/src/multi.c Tue Oct 10 10:16:26 2000 +0000 +++ b/src/multi.c Tue Oct 10 10:35:05 2000 +0000 @@ -22,6 +22,7 @@ #include #include "multi.h" #include "gaim.h" +#include "gnome_applet_mgr.h" #include "aim.h" #include "pixmaps/gnome_add.xpm" diff -r 50f2977537d8 -r f7886476f9d9 src/oscar.c --- a/src/oscar.c Tue Oct 10 10:16:26 2000 +0000 +++ b/src/oscar.c Tue Oct 10 10:35:05 2000 +0000 @@ -1155,7 +1155,8 @@ aim_bos_setprofile(sess, command->conn, gc->user_info, NULL, gaim_caps); aim_bos_reqbuddyrights(sess, command->conn); - gtk_widget_hide(mainwindow); + if (mainwindow) + gtk_widget_hide(mainwindow); show_buddy_list(); #ifdef USE_APPLET diff -r 50f2977537d8 -r f7886476f9d9 src/toc.c --- a/src/toc.c Tue Oct 10 10:16:26 2000 +0000 +++ b/src/toc.c Tue Oct 10 10:35:05 2000 +0000 @@ -39,7 +39,7 @@ #include "gaim.h" #include "gnome_applet_mgr.h" -#define REVISION "gaim:$Revision: 974 $" +#define REVISION "gaim:$Revision: 976 $" static unsigned int peer_ver=0; @@ -134,7 +134,8 @@ config = toc_wait_config(gc); gc->state = STATE_ONLINE; - gtk_widget_hide(mainwindow); + if (mainwindow) + gtk_widget_hide(mainwindow); show_buddy_list(); #ifdef USE_APPLET if (general_options & OPT_GEN_APP_BUDDY_SHOW) {