Menu
▾
▴
[Gaim-commits] CVS: gaim/src gtkstatusbox.c,1.80,1.81 gtkstatusbox.h,1.17,1.18
|
From: Mark D. <the...@us...> - 2006-01-09 06:34:14
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4319/src Modified Files: gtkstatusbox.c gtkstatusbox.h Log Message: Change the status box code to not use the new 'data' column to keep track of the GaimStatusPrimitive instead of using the 'type.' This should be a lot cleaner Index: gtkstatusbox.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -p -r1.80 -r1.81 --- gtkstatusbox.c 9 Jan 2006 06:11:28 -0000 1.80 +++ gtkstatusbox.c 9 Jan 2006 06:34:03 -0000 1.81 @@ -70,7 +70,8 @@ enum { TEXT_COLUMN, /* A string */ TITLE_COLUMN, /* The plain-English title of this item */ DESC_COLUMN, /* A plain-English description of this item */ - DATA_COLUMN, /* Keep track of the creation time of popular statuses here */ + DATA_COLUMN, /* Keep track of the creation time of popular + statuses, and also the GaimStatusPrimitive */ NUM_COLUMNS }; @@ -441,6 +442,8 @@ add_popular_statuses(GtkGaimStatusBox *s pixbuf = gtk_widget_render_icon(GTK_WIDGET(statusbox->vbox), GAIM_STOCK_STATUS_AWAY, icon_size, "GtkGaimStatusBox"); + gtk_gaim_status_box_add_separator(statusbox); + for (cur = list; cur != NULL; cur = cur->next) { GaimSavedStatus *saved = cur->data; @@ -449,8 +452,6 @@ add_popular_statuses(GtkGaimStatusBox *s GINT_TO_POINTER(gaim_savedstatus_get_creation_time(saved))); } - gtk_gaim_status_box_add_separator(statusbox); - g_list_free(list); } @@ -474,6 +475,7 @@ gtk_gaim_status_box_regenerate(GtkGaimSt account = GTK_GAIM_STATUS_BOX(status_box)->account; if (account == NULL) { + /* Global */ pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_ONLINE, icon_size, "GtkGaimStatusBox"); pixbuf2 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_AWAY, @@ -482,20 +484,22 @@ gtk_gaim_status_box_regenerate(GtkGaimSt icon_size, "GtkGaimStatusBox"); pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_INVISIBLE, icon_size, "GtkGaimStatusBox"); - /* hacks */ - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GAIM_STATUS_AVAILABLE, pixbuf, _("Available"), NULL, NULL); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GAIM_STATUS_AWAY, pixbuf2, _("Away"), NULL, NULL); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GAIM_STATUS_INVISIBLE, pixbuf4, _("Invisible"), NULL, NULL); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GAIM_STATUS_OFFLINE, pixbuf3, _("Offline"), NULL, NULL); - gtk_gaim_status_box_add_separator(GTK_GAIM_STATUS_BOX(status_box)); + + gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, _("Available"), NULL, GINT_TO_POINTER(GAIM_STATUS_AVAILABLE)); + gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf2, _("Away"), NULL, GINT_TO_POINTER(GAIM_STATUS_AWAY)); + gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf4, _("Invisible"), NULL, GINT_TO_POINTER(GAIM_STATUS_INVISIBLE)); + gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf3, _("Offline"), NULL, GINT_TO_POINTER(GAIM_STATUS_OFFLINE)); + add_popular_statuses(status_box); + + gtk_gaim_status_box_add_separator(GTK_GAIM_STATUS_BOX(status_box)); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_CUSTOM, pixbuf, _("Custom..."), NULL, NULL); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_SAVED, pixbuf, _("Saved..."), NULL, NULL); - update_to_reflect_current_status(status_box); } else { + /* Per-account */ const GList *l; for (l = gaim_account_get_status_types(account); l != NULL; l = l->next) @@ -511,6 +515,7 @@ gtk_gaim_status_box_regenerate(GtkGaimSt gaim_status_type_get_name(status_type), NULL, NULL); } + update_to_reflect_account_status(status_box, account, gaim_account_get_active_status(account)); } } @@ -1006,6 +1011,7 @@ static void activate_currently_selected_status(GtkGaimStatusBox *status_box) { GtkGaimStatusBoxItemType type; + gpointer data; gchar *title; GtkTreeIter iter; char *message; @@ -1016,17 +1022,20 @@ activate_currently_selected_status(GtkGa return; gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter, - TYPE_COLUMN, &type, -1); + TYPE_COLUMN, &type, + DATA_COLUMN, &data, + -1); /* * If the currently selected status is "Custom..." or - * "Saved..." then do nothing. Custom statuses are + * "Saved..." or a popular status then do nothing. + * Custom statuses are * activated elsewhere, and we update the status_box * accordingly by monitoring the preference * "/core/savedstatus/current" and then calling * update_to_reflect_current_status() */ - if (type >= GAIM_STATUS_NUM_PRIMITIVES) + if (type != GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE) return; gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter, @@ -1039,7 +1048,29 @@ activate_currently_selected_status(GtkGa status_box->imhtml_visible = FALSE; } - if (status_box->account) { + if (status_box->account == NULL) { + /* Global */ + /* Save the newly selected status to prefs.xml and status.xml */ + + /* Has the status been really changed? */ + saved_status = gaim_savedstatus_get_current(); + if (gaim_savedstatus_get_type(saved_status) == GPOINTER_TO_INT(data)) + { + if (!message_changed(gaim_savedstatus_get_message(saved_status), message)) + changed = FALSE; + } + + if (changed) + { + /* Create a new transient saved status */ + saved_status = gaim_savedstatus_new(NULL, GPOINTER_TO_INT(data)); + gaim_savedstatus_set_message(saved_status, message); + + /* Set the status for each account */ + gaim_savedstatus_activate(saved_status); + } + } else { + /* Per-account */ gint active; GaimStatusType *status_type; GaimStatus *status; @@ -1068,26 +1099,6 @@ activate_currently_selected_status(GtkGa gaim_account_set_status(status_box->account, id, TRUE, NULL); } - } else { - /* Save the newly selected status to prefs.xml and status.xml */ - - /* Has the status been really changed? */ - saved_status = gaim_savedstatus_get_current(); - if (gaim_savedstatus_get_type(saved_status) == type) - { - if (!message_changed(gaim_savedstatus_get_message(saved_status), message)) - changed = FALSE; - } - - if (changed) - { - /* Create a new transient saved status */ - saved_status = gaim_savedstatus_new(NULL, type); - gaim_savedstatus_set_message(saved_status, message); - - /* Set the status for each account */ - gaim_savedstatus_activate(saved_status); - } } g_free(title); @@ -1207,7 +1218,7 @@ static void gtk_gaim_status_box_changed( } /* - * Show the message box whenever 'type' allows for a + * Show the message box whenever the primitive allows for a * message attribute on any protocol that is enabled, * or our protocol, if we have account set */ @@ -1222,7 +1233,7 @@ static void gtk_gaim_status_box_changed( GaimStatusType *status_type; account = node->data; - status_type = gaim_account_get_status_type_with_primitive(account, type); + status_type = gaim_account_get_status_type_with_primitive(account, GPOINTER_TO_INT(data)); if ((status_type != NULL) && (gaim_status_type_get_attr(status_type, "message") != NULL)) { @@ -1275,16 +1286,6 @@ static void imhtml_format_changed_cb(Gtk imhtml_changed_cb(NULL, data); } -GtkGaimStatusBoxItemType gtk_gaim_status_box_get_active_type(GtkGaimStatusBox *status_box) -{ - GtkTreeIter iter; - GtkGaimStatusBoxItemType type; - gtk_combo_box_get_active_iter(GTK_COMBO_BOX(status_box), &iter); - gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter, - TYPE_COLUMN, &type, -1); - return type; -} - char *gtk_gaim_status_box_get_message(GtkGaimStatusBox *status_box) { if (status_box->imhtml_visible) Index: gtkstatusbox.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -p -r1.17 -r1.18 --- gtkstatusbox.h 9 Jan 2006 06:11:26 -0000 1.17 +++ gtkstatusbox.h 9 Jan 2006 06:34:03 -0000 1.18 @@ -52,14 +52,11 @@ G_BEGIN_DECLS */ typedef enum { - /* - * The first 0 through GAIM_STATUS_NUM_PRIMITIVES - * correspond to GaimStatusPrimitives. - */ - GTK_GAIM_STATUS_BOX_TYPE_SEPARATOR = GAIM_STATUS_NUM_PRIMITIVES, + GTK_GAIM_STATUS_BOX_TYPE_SEPARATOR, + GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, + GTK_GAIM_STATUS_BOX_TYPE_POPULAR, GTK_GAIM_STATUS_BOX_TYPE_CUSTOM, GTK_GAIM_STATUS_BOX_TYPE_SAVED, - GTK_GAIM_STATUS_BOX_TYPE_POPULAR, GTK_GAIM_STATUS_BOX_NUM_TYPES } GtkGaimStatusBoxItemType; @@ -151,8 +148,6 @@ gtk_gaim_status_box_set_connecting(GtkGa void gtk_gaim_status_box_pulse_connecting(GtkGaimStatusBox *status_box); -GtkGaimStatusBoxItemType gtk_gaim_status_box_get_active_type(GtkGaimStatusBox *status_box); - char *gtk_gaim_status_box_get_message(GtkGaimStatusBox *status_box); G_END_DECLS |