Menu
▾
▴
[Gaim-commits] CVS: gaim/src gtkaccount.c,1.196,1.197 gtkstatusbox.c,1.19,1.20 gtkstatusbox.h,1.6,1.7 idle.c,1.73,1.74 savedstatuses.c,1.13,1.14 savedstatuses.h,1.5,1.6
|
From: Mark D. <the...@us...> - 2005-10-22 22:29:48
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30110 Modified Files: gtkaccount.c gtkstatusbox.c gtkstatusbox.h idle.c savedstatuses.c savedstatuses.h Log Message: If you're online, and sitting around, and la-di-da you enable one of your accounts, it will now use the status currently set in your gtkstatusbox instead of whatever the account was set to when it was disabled Index: gtkaccount.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v retrieving revision 1.196 retrieving revision 1.197 diff -u -d -p -r1.196 -r1.197 --- gtkaccount.c 13 Oct 2005 02:50:13 -0000 1.196 +++ gtkaccount.c 22 Oct 2005 22:29:39 -0000 1.197 @@ -35,6 +35,7 @@ #include "prefs.h" #include "prpl.h" #include "request.h" +#include "savedstatuses.h" #include "signals.h" #include "util.h" @@ -2129,6 +2130,8 @@ enabled_cb(GtkCellRendererToggle *render GtkTreeModel *model = GTK_TREE_MODEL(dialog->model); GtkTreeIter iter; gboolean enabled; + const char *current_savedstatus_name; + const GaimSavedStatus *saved_status; gtk_tree_model_get_iter_from_string(model, &iter, path_str); gtk_tree_model_get(model, &iter, @@ -2136,20 +2139,11 @@ enabled_cb(GtkCellRendererToggle *render COLUMN_ENABLED, &enabled, -1); - /* TODO: Set the statuses for this account to match the GtkStatusBox */ - /* - GtkWidget *blist; - GtkWidget *statusbox; - GaimStatus *status; - - blist = gaim_gtk_blist_get_default_gtk_blist(); - statusbox = blist->statusbox; - status = gaim_gtk_status_box_get_current_status(); + /* Set the statuses for this account to the current status */ + current_savedstatus_name = gaim_prefs_get_string("/core/status/current"); + saved_status = gaim_savedstatus_find(current_savedstatus_name); + gaim_savedstatus_activate_for_account(saved_status, account); - gaim_account_set_status(account, ); - gaim_account_set_status_vargs(account, ); - gaim_account_set_status_list(account, ); - */ gaim_account_set_enabled(account, GAIM_GTK_UI, !enabled); gtk_list_store_set(dialog->model, &iter, Index: gtkstatusbox.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -p -r1.19 -r1.20 --- gtkstatusbox.c 17 Oct 2005 05:50:30 -0000 1.19 +++ gtkstatusbox.c 22 Oct 2005 22:29:39 -0000 1.20 @@ -499,11 +499,6 @@ gtk_gaim_status_box_pulse_typing(GtkGaim gtk_gaim_status_box_refresh(status_box); } -void -gtk_gaim_status_box_activate_saved_status(GaimSavedStatus *saved_status) -{ -} - static void activate_currently_selected_status(GtkGaimStatusBox *status_box) { Index: gtkstatusbox.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -p -r1.6 -r1.7 --- gtkstatusbox.h 17 Oct 2005 05:50:30 -0000 1.6 +++ gtkstatusbox.h 22 Oct 2005 22:29:39 -0000 1.7 @@ -119,8 +119,6 @@ gtk_gaim_status_box_set_connecting(GtkGa void gtk_gaim_status_box_pulse_connecting(GtkGaimStatusBox *status_box); -void gtk_gaim_status_box_activate_saved_status(GaimSavedStatus *saved_status); - char *gtk_gaim_status_box_get_active_type(GtkGaimStatusBox *status_box); char *gtk_gaim_status_box_get_message(GtkGaimStatusBox *status_box); Index: idle.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/idle.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -p -r1.73 -r1.74 --- idle.c 20 Oct 2005 03:48:22 -0000 1.73 +++ idle.c 22 Oct 2005 22:29:39 -0000 1.74 @@ -35,7 +35,6 @@ #include "connection.h" #include "debug.h" -#include "gtkstatusbox.h" #include "log.h" #include "prefs.h" #include "savedstatuses.h" @@ -158,11 +157,10 @@ check_idle(gpointer data) gaim_debug_info("idle", "Making %s auto-away\n", gaim_account_get_username(account)); - /* TODO XXX STATUS AWAY CORE/UI */ /* Mark our accounts "away" using the idleaway status */ idleaway_name = gaim_prefs_get_string("/core/status/idleaway"); saved_status = gaim_savedstatus_find(idleaway_name); - gtk_gaim_status_box_activate_saved_status(saved_status); + gaim_savedstatus_activate(saved_status); gc->is_auto_away = GAIM_IDLE_AUTO_AWAY; } else { Index: savedstatuses.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/savedstatuses.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -p -r1.13 -r1.14 --- savedstatuses.c 13 Oct 2005 01:29:43 -0000 1.13 +++ savedstatuses.c 22 Oct 2005 22:29:40 -0000 1.14 @@ -498,6 +498,49 @@ gaim_savedstatus_has_substatuses(const G return (saved_status->substatuses != NULL); } +void +gaim_savedstatus_activate(const GaimSavedStatus *saved_status) +{ + GList *accounts; + + accounts = gaim_accounts_get_all_active(); + + while (accounts != NULL) + { + GaimAccount *account; + + account = accounts->data; + gaim_savedstatus_activate_for_account(saved_status, account); + accounts = accounts->next; + } +} + +void +gaim_savedstatus_activate_for_account(const GaimSavedStatus *saved_status, + GaimAccount *account) +{ + const GList *status_types; + GaimStatusType *status_type; + + /* Find the status type that matches the given primitive */ + status_types = gaim_account_get_status_types(account); + while (status_types != NULL) + { + status_type = status_types->data; + if (gaim_status_type_get_primitive(status_type) == saved_status->type) + { + if (saved_status->message != NULL) + gaim_account_set_status(account, gaim_status_type_get_id(status_type), + TRUE, "message", saved_status->message, NULL); + else + gaim_account_set_status(account, gaim_status_type_get_id(status_type), + TRUE, NULL); + return; + } + status_types = status_types->next; + } +} + void * gaim_savedstatuses_get_handle(void) { Index: savedstatuses.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/savedstatuses.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -p -r1.5 -r1.6 --- savedstatuses.h 13 Oct 2005 01:29:43 -0000 1.5 +++ savedstatuses.h 22 Oct 2005 22:29:40 -0000 1.6 @@ -168,6 +168,24 @@ const char *gaim_savedstatus_get_message gboolean gaim_savedstatus_has_substatuses(const GaimSavedStatus *saved_status); /** + * Sets the statuses for all your accounts to those specified + * by the given saved_status. This function calls + * gaim_savedstatus_activate_for_account() for all your accounts. + * + * @param saved_status The status you want to set your accounts to. + */ +void gaim_savedstatus_activate(const GaimSavedStatus *saved_status); + +/** + * Sets the statuses for a given account to those specified + * by the given saved_status. + * + * @param saved_status The status you want to set your accounts to. + * @param account The account whose statuses you want to change. + */ +void gaim_savedstatus_activate_for_account(const GaimSavedStatus *saved_status, GaimAccount *account); + +/** * Get the handle for the status subsystem. * * @return the handle to the status subsystem |