From dd7bad07415b4b2a46d3bae6236838d52334f6fb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 10 Jan 2008 11:19:37 +0000 Subject: ** Fix for bug #211353 2008-01-10 Milan Crha ** Fix for bug #211353 * po/POTFILES.in: Added new file e-util/e-util-labels.c * mail/filtertypes.xml: * mail/vfoldertypes.xml: * mail/em-folder-view.c: * mail/em-folder-browser.c: * mail/em-mailer-prefs.h: * mail/em-mailer-prefs.c: * mail/mail-config.h: * mail/mail-config.c: * mail/mail-config.glade: * mail/message-list.c: Label tags are now generated based on label name when creating, except of first 5 labels. New menu option "New Label" in popup menu over message list and editing of labels has been changed in Preferences. Also renaming tab in Preferences for "Labels", not "Colors", and the tab label too. mail-config-label... functions was moved to e-util/e-util-labels.c/.h. * mail/message-list.etspec: Normalized columns has been moved by one when label column has been added. * filter/filter-option.h: * filter/filter-option.c: (filter_option_get_current), (filter_option_remove_all): New functions to be able to refill options even after initialization of the filter element. * filter/filter-label.c: Added support to notify changes on labels in runtime and use actual labels. * e-util/Makefile.am: * e-util/e-util-labels.h: * e-util/e-util-labels.c: New files to work with labels. svn path=/trunk/; revision=34788 --- mail/mail-config.h | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'mail/mail-config.h') diff --git a/mail/mail-config.h b/mail/mail-config.h index 454a44f2bf..c08eaf34a4 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -25,7 +25,6 @@ #include #include -#include #include "camel/camel-provider.h" /* can't forward-declare enums, bah */ @@ -88,15 +87,6 @@ typedef enum { MAIL_CONFIG_XMAILER_RUPERT_APPROVED = 4 } MailConfigXMailerDisplayStyle; -typedef struct { - char *tag; - char *name; - char *colour; -} MailConfigLabel; - -#define LABEL_DEFAULTS_NUM 5 -extern MailConfigLabel label_defaults[LABEL_DEFAULTS_NUM]; - /* Configuration */ void mail_config_init (void); void mail_config_clear (void); @@ -109,17 +99,7 @@ struct _GConfClient *mail_config_get_gconf_client (void); gboolean mail_config_is_configured (void); gboolean mail_config_is_corrupt (void); -GSList * mail_config_get_labels (void); -char * mail_config_get_next_label_tag (int *id); -gboolean mail_config_is_system_label (const char *tag); -gboolean mail_config_add_label (const char *tag, const char *name, const GdkColor *color); -gboolean mail_config_remove_label (const char *tag); -const char *mail_config_get_label_name (const char *tag); -gboolean mail_config_get_label_color (const char *tag, GdkColor *color); -const char *mail_config_get_label_color_str (const char *tag); -const char *mail_config_get_new_label_tag (const char *old_tag); -gboolean mail_config_set_label_name (const char *tag, const char *name); -gboolean mail_config_set_label_color (const char *tag, const GdkColor *color); +GSList *mail_config_get_labels (void); const char **mail_config_get_allowable_mime_types (void); -- cgit