aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-04-20 04:17:51 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-04-20 04:17:51 +0800
commit6c44efe38a69872608ee31954de846aab1a691f2 (patch)
treeaf2381f90dc77831c7d652d685b0938a38a4861d /mail
parentd0d8d568ad9a830e50845f3d86fb30105b37d319 (diff)
downloadgsoc2013-evolution-6c44efe38a69872608ee31954de846aab1a691f2.tar
gsoc2013-evolution-6c44efe38a69872608ee31954de846aab1a691f2.tar.gz
gsoc2013-evolution-6c44efe38a69872608ee31954de846aab1a691f2.tar.bz2
gsoc2013-evolution-6c44efe38a69872608ee31954de846aab1a691f2.tar.lz
gsoc2013-evolution-6c44efe38a69872608ee31954de846aab1a691f2.tar.xz
gsoc2013-evolution-6c44efe38a69872608ee31954de846aab1a691f2.tar.zst
gsoc2013-evolution-6c44efe38a69872608ee31954de846aab1a691f2.zip
Removed variables that got re-added with the icon-theme patch somehow.
2004-04-19 Jeffrey Stedfast <fejj@ximian.com> * em-composer-prefs.h: Removed variables that got re-added with the icon-theme patch somehow. * em-account-prefs.c: Don't bother keeping global references to the enable_pixbuf anymore, since it's unnecessary. svn path=/trunk/; revision=25523
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-account-prefs.c8
-rw-r--r--mail/em-composer-prefs.h7
-rw-r--r--mail/em-format-html-display.c2
-rw-r--r--mail/em-format-html.c4
-rw-r--r--mail/message-list.c6
6 files changed, 16 insertions, 19 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index bb8024d8f1..ffa6994ed8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-19 Jeffrey Stedfast <fejj@ximian.com>
+
+ * em-composer-prefs.h: Removed variables that got re-added with
+ the icon-theme patch somehow.
+
+ * em-account-prefs.c: Don't bother keeping global references to
+ the enable_pixbuf anymore, since it's unnecessary.
+
2004-04-19 Michael Terry <mike@mterry.name>
* GNOME_Evolution_Mail.server.in.in:
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index 988a6ab216..35f27ec161 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -48,8 +48,6 @@ static void em_account_prefs_destroy (GtkObject *object);
static void mail_accounts_load (EMAccountPrefs *prefs);
-static GdkPixbuf *disabled_pixbuf = NULL;
-static GdkPixbuf *enabled_pixbuf = NULL;
static GtkVBoxClass *parent_class = NULL;
@@ -90,10 +88,6 @@ em_account_prefs_class_init (EMAccountPrefsClass *klass)
gtk_object_class->destroy = em_account_prefs_destroy;
object_class->finalize = em_account_prefs_finalise;
-
- /* setup static data */
- disabled_pixbuf = NULL;
- enabled_pixbuf = e_icon_factory_get_icon ("stock_mark", 16);
}
static void
@@ -102,7 +96,7 @@ em_account_prefs_init (EMAccountPrefs *prefs)
prefs->druid = NULL;
prefs->editor = NULL;
- prefs->mark_pixbuf = g_object_ref (enabled_pixbuf);
+ prefs->mark_pixbuf = e_icon_factory_get_icon ("stock_mark", 16);
}
static void
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h
index df0fcd6ed1..75a4201205 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -76,12 +76,7 @@ struct _EMComposerPrefs {
GtkTreeView *language;
CORBA_sequence_GNOME_Spell_Language *language_seq;
gboolean spell_active;
-
- char *language_str;
- char *language_str_orig;
- GdkColor spell_error_color;
- GdkColor spell_error_color_orig;
-
+
GdkPixbuf *enabled_pixbuf;
GtkWidget *spell_able_button;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 2669a8c7f2..f67860f11f 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -966,7 +966,7 @@ static void efhd_format_prefix(EMFormat *emf, CamelStream *stream)
time_t date;
char due_date[128];
struct tm due_tm;
- gchar *iconpath;
+ char *iconpath;
if (emf->folder == NULL || emf->uid == NULL
|| (flag = camel_folder_get_message_user_tag(emf->folder, emf->uid, "follow-up")) == NULL
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 67ca9d5b4d..5864eaac52 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -297,7 +297,7 @@ em_format_html_file_part(EMFormatHTML *efh, const char *mime_type, const char *f
CamelMimePart *part;
CamelStream *stream;
CamelDataWrapper *dw;
- gchar *basename;
+ char *basename;
stream = camel_stream_fs_new_with_name(filename, O_RDONLY, 0);
if (stream == NULL)
@@ -596,7 +596,7 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel
&& (valid->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE
|| valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE)) {
char *classid;
- gchar *iconpath;
+ char *iconpath;
CamelMimePart *iconpart;
camel_stream_printf(stream, "<table border=0 width=\"100%%\" cellpadding=3 cellspacing=0 bgcolor=%s><tr>",
diff --git a/mail/message-list.c b/mail/message-list.c
index 661f695b82..23340d08f9 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -157,14 +157,14 @@ enum {
static guint message_list_signals [LAST_SIGNAL] = {0, };
static struct {
- gchar *icon_name;
+ char *icon_name;
GdkPixbuf *pixbuf;
} states_pixmaps [] = {
{ "stock_mail-unread", NULL },
{ "stock_mail-open", NULL },
{ "stock_mail-replied", NULL },
- { "stock_mail-unread-multiple", NULL },
- { "stock_mail-open-multiple", NULL },
+ { "stock_mail-unread-multiple", NULL },
+ { "stock_mail-open-multiple", NULL },
{ "", NULL },
{ "stock_attach", NULL },
{ "stock_mail-priority-high", NULL },