Mercurial > pidgin.yaz

comparison src/gtkstatusbox.c @ 13025:7d39e6c73dc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15378] Changing "Custom..." to "New..." in the status box. I couldn't differentiate between Custom and Saved fast enough without thinking. I'm hoping this will help committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 24 Jan 2006 00:57:37 +0000
parents e8adf8183cf4
children 18fc2a679e38
comparison
equal deleted inserted replaced
13024:01e09b601840 13025:7d39e6c73dc3
343 /** 343 /**
344 * This updates the GtkTreeView so that it correctly shows the state 344 * This updates the GtkTreeView so that it correctly shows the state
345 * we are currently using. It is used when the current state is 345 * we are currently using. It is used when the current state is
346 * updated from somewhere other than the GtkStatusBox (from a plugin, 346 * updated from somewhere other than the GtkStatusBox (from a plugin,
347 * or when signing on with the "-n" option, for example). It is 347 * or when signing on with the "-n" option, for example). It is
348 * also used when the user selects the "Custom..." option. 348 * also used when the user selects the "New..." option.
349 * 349 *
350 * Maybe we could accomplish this by triggering off the mouse and 350 * Maybe we could accomplish this by triggering off the mouse and
351 * keyboard signals instead of the changed signal? 351 * keyboard signals instead of the changed signal?
352 */ 352 */
353 static void 353 static void
495 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)); 495 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));
496 496
497 add_popular_statuses(status_box); 497 add_popular_statuses(status_box);
498 498
499 gtk_gaim_status_box_add_separator(GTK_GAIM_STATUS_BOX(status_box)); 499 gtk_gaim_status_box_add_separator(GTK_GAIM_STATUS_BOX(status_box));
500 gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_CUSTOM, pixbuf, _("Custom..."), NULL, NULL); 500 gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_CUSTOM, pixbuf, _("New..."), NULL, NULL);
501 gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_SAVED, pixbuf, _("Saved..."), NULL, NULL); 501 gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_SAVED, pixbuf, _("Saved..."), NULL, NULL);
502 502
503 update_to_reflect_current_status(status_box); 503 update_to_reflect_current_status(status_box);
504 504
505 } else { 505 } else {
1032 TYPE_COLUMN, &type, 1032 TYPE_COLUMN, &type,
1033 DATA_COLUMN, &data, 1033 DATA_COLUMN, &data,
1034 -1); 1034 -1);
1035 1035
1036 /* 1036 /*
1037 * If the currently selected status is "Custom..." or 1037 * If the currently selected status is "New..." or
1038 * "Saved..." or a popular status then do nothing. 1038 * "Saved..." or a popular status then do nothing.
1039 * Custom statuses are 1039 * Custom statuses are
1040 * activated elsewhere, and we update the status_box 1040 * activated elsewhere, and we update the status_box
1041 * accordingly by monitoring the preference 1041 * accordingly by monitoring the preference
1042 * "/core/savedstatus/current" and then calling 1042 * "/core/savedstatus/current" and then calling