# HG changeset patch # User Christian Hammond # Date 1054364398 0 # Node ID 1c55b1540e18e5ff7b2cd6abee86007e730ed5ea # Parent cde28f5c47d4083e414fe04b5944f792ad421528 [gaim-migrate @ 5991] The rest of the plugins compile. Well, the default ones. notify.c is no longer compiled by default. I don't know for sure what we're doing with this, but I didn't want to fix it :) committer: Tailor Script diff -r cde28f5c47d4 -r 1c55b1540e18 plugins/Makefile.am --- a/plugins/Makefile.am Sat May 31 06:50:47 2003 +0000 +++ b/plugins/Makefile.am Sat May 31 06:59:58 2003 +0000 @@ -10,7 +10,7 @@ autorecon_la_LDFLAGS = -module -avoid-version iconaway_la_LDFLAGS = -module -avoid-version -notify_la_LDFLAGS = -module -avoid-version +#notify_la_LDFLAGS = -module -avoid-version spellchk_la_LDFLAGS = -module -avoid-version history_la_LDFLAGS = -module -avoid-version timestamp_la_LDFLAGS = -module -avoid-version @@ -22,16 +22,17 @@ plugin_LTLIBRARIES = \ autorecon.la \ iconaway.la \ - notify.la \ spellchk.la \ history.la \ timestamp.la \ idle.la \ statenotify.la +# notify.la + autorecon_la_SOURCES = autorecon.c iconaway_la_SOURCES = iconaway.c -notify_la_SOURCES = notify.c +#notify_la_SOURCES = notify.c spellchk_la_SOURCES = spellchk.c history_la_SOURCES = history.c timestamp_la_SOURCES = timestamp.c @@ -43,6 +44,7 @@ EXTRA_DIST = \ ChangeLog PERL-HOWTO HOWTO SIGNALS \ filectl.c mailchk.c gtik.c \ + raw.c events.c simple.c \ gaim.pl fortuneprofile.pl AM_CPPFLAGS = \ diff -r cde28f5c47d4 -r 1c55b1540e18 plugins/autorecon.c --- a/plugins/autorecon.c Sat May 31 06:50:47 2003 +0000 +++ b/plugins/autorecon.c Sat May 31 06:59:58 2003 +0000 @@ -19,19 +19,19 @@ static guint tim = 0; static gboolean do_signon(gpointer data) { - struct gaim_account *account = data; + GaimAccount *account = data; gaim_debug(GAIM_DEBUG_INFO, "autorecon", "do_signon called\n"); if (g_slist_index(gaim_accounts, account) < 0) return FALSE; - gaim_debug(GAIM_DEBUG_INFO, "autorecon", "calling serv_login\n"); - serv_login(account); - gaim_debug(GAIM_DEBUG_INFO, "autorecon", "done calling serv_login\n"); + gaim_debug(GAIM_DEBUG_INFO, "autorecon", "calling gaim_account_connect\n"); + gaim_account_connect(account); + gaim_debug(GAIM_DEBUG_INFO, "autorecon", "done calling gaim_account_connect\n"); tim = 0; return FALSE; } -static void reconnect(struct gaim_connection *gc, void *m) { +static void reconnect(GaimConnection *gc, void *m) { if (!gc->wants_to_die) { int del; del = (int)g_hash_table_lookup(hash, gc->account); diff -r cde28f5c47d4 -r 1c55b1540e18 plugins/iconaway.c --- a/plugins/iconaway.c Sat May 31 06:50:47 2003 +0000 +++ b/plugins/iconaway.c Sat May 31 06:59:58 2003 +0000 @@ -18,7 +18,7 @@ extern void applet_destroy_buddy(); #endif -void iconify_windows(struct gaim_connection *gc, char *state, +void iconify_windows(GaimConnection *gc, char *state, char *message, void *data) { struct gaim_window *win; GList *windows; diff -r cde28f5c47d4 -r 1c55b1540e18 plugins/idle.c --- a/plugins/idle.c Sat May 31 06:50:47 2003 +0000 +++ b/plugins/idle.c Sat May 31 06:59:58 2003 +0000 @@ -12,31 +12,37 @@ #define IDLE_PLUGIN_ID "gtk-idle" -static struct gaim_connection *gc = NULL; +static GaimConnection *gc = NULL; static void set_idle(GtkWidget *button, GtkWidget *spinner) { time_t t; int tm = CLAMP(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spinner)), 0, G_MAXINT); - if (!gc) { + GaimAccount *account; + + if (!gc) return; - } + + account = gaim_connection_get_account(gc); + gaim_debug(GAIM_DEBUG_INFO, "idle", - "setting idle time for %s to %d\n", gc->username, tm); + "setting idle time for %s to %d\n", + gaim_account_get_username(account), tm); time(&t); t -= 60 * tm; - gc->lastsent = t; + gc->last_sent_time = t; serv_set_idle(gc, 60 * tm); gc->is_idle = 0; } -static void sel_gc(GtkWidget *opt, struct gaim_connection *g) { +static void sel_gc(GtkWidget *opt, GaimConnection *g) { gc = g; } static void make_connect_menu(GtkWidget *box) { GtkWidget *optmenu, *menu, *opt; - GSList *c = connections; - struct gaim_connection *g; + GaimAccount *account; + GList *c = gaim_connections_get_all(); + GaimConnection *g; optmenu = gtk_option_menu_new(); gtk_box_pack_start(GTK_BOX(box), optmenu, FALSE, FALSE, 5); @@ -44,21 +50,23 @@ menu = gtk_menu_new(); while (c) { - g = (struct gaim_connection *)c->data; - opt = gtk_menu_item_new_with_label(g->username); + g = (GaimConnection *)c->data; + account = gaim_connection_get_account(g); + + opt = gtk_menu_item_new_with_label(gaim_account_get_username(g)); g_signal_connect(G_OBJECT(opt), "activate", G_CALLBACK(sel_gc), g); gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); gtk_widget_show(opt); - c = g_slist_next(c); + c = g_list_next(c); } gtk_option_menu_remove_menu(GTK_OPTION_MENU(optmenu)); gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu); gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), 0); - if (connections) - gc = connections->data; + if (gaim_connections_get_all()) + gc = gaim_connections_get_all()->data; else gc = NULL; } diff -r cde28f5c47d4 -r 1c55b1540e18 plugins/spellchk.c --- a/plugins/spellchk.c Sat May 31 06:50:47 2003 +0000 +++ b/plugins/spellchk.c Sat May 31 06:59:58 2003 +0000 @@ -38,7 +38,7 @@ static void substitute(char **, int, int, const char *); static GtkListStore *model; -static void substitute_words(struct gaim_connection *gc, char *who, char **message, void *m) { +static void substitute_words(GaimConnection *gc, char *who, char **message, void *m) { int i, l; int word; char *tmp; diff -r cde28f5c47d4 -r 1c55b1540e18 plugins/statenotify.c --- a/plugins/statenotify.c Sat May 31 06:50:47 2003 +0000 +++ b/plugins/statenotify.c Sat May 31 06:59:58 2003 +0000 @@ -1,7 +1,7 @@ #include "gaim.h" static void -write_status(struct gaim_connection *gc, char *who, const char *message) +write_status(GaimConnection *gc, char *who, const char *message) { struct gaim_conversation *conv; struct buddy *b; @@ -21,25 +21,25 @@ } static void -buddy_away_cb(struct gaim_connection *gc, char *who, void *data) +buddy_away_cb(GaimConnection *gc, char *who, void *data) { write_status(gc, who, "has gone away."); } static void -buddy_unaway_cb(struct gaim_connection *gc, char *who, void *data) +buddy_unaway_cb(GaimConnection *gc, char *who, void *data) { write_status(gc, who, "is no longer away."); } static void -buddy_idle_cb(struct gaim_connection *gc, char *who, void *data) +buddy_idle_cb(GaimConnection *gc, char *who, void *data) { write_status(gc, who, "has become idle."); } static void -buddy_unidle_cb(struct gaim_connection *gc, char *who, void *data) +buddy_unidle_cb(GaimConnection *gc, char *who, void *data) { write_status(gc, who, "is no longer idle."); } diff -r cde28f5c47d4 -r 1c55b1540e18 plugins/ticker/ticker.c --- a/plugins/ticker/ticker.c Sat May 31 06:50:47 2003 +0000 +++ b/plugins/ticker/ticker.c Sat May 31 06:59:58 2003 +0000 @@ -187,7 +187,7 @@ } } -void signon_cb(struct gaim_connection *gc, char *who) { +void signon_cb(GaimConnection *gc, char *who) { struct buddy *b = gaim_find_buddy(gc->account, who); if(buddy_ticker_find_buddy(b)) buddy_ticker_set_pixmap(b); @@ -195,7 +195,7 @@ buddy_ticker_add_buddy(b); } -void signoff_cb(struct gaim_connection *gc) { +void signoff_cb(GaimConnection *gc) { if (!connections) { while(tickerbuds) { g_free(tickerbuds->data); @@ -217,7 +217,7 @@ } } -void buddy_signoff_cb(struct gaim_connection *gc, char *who) { +void buddy_signoff_cb(GaimConnection *gc, char *who) { struct buddy *b = gaim_find_buddy(gc->account, who); buddy_ticker_remove_buddy(b); @@ -225,7 +225,7 @@ gtk_widget_hide(tickerwindow); } -void away_cb(struct gaim_connection *gc, char *who) { +void away_cb(GaimConnection *gc, char *who) { struct buddy *b = gaim_find_buddy(gc->account, who); if(buddy_ticker_find_buddy(b)) buddy_ticker_set_pixmap(b);