callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed references to NEEDS_REPLY.

Browse Source 
2002-02-06  Jeffrey Stedfast  <fejj@ximian.com>

	* message-list.c: Removed references to NEEDS_REPLY.

	* mail-callbacks.c (mark_as_needing_reply): Removed.
	(mark_as_not_needing_reply): Removed.
	(toggle_need_reply): Removed.

	* folder-browser.c (on_right_click): Remove CAN_MARK_NEEDS_REPLY
	stuff, this is going to be implemented in an entirely different
	way.

svn path=/trunk/; revision=15585
This commit is contained in:
Jeffrey Stedfast
2002-02-07 00:27:24 +00:00
committed by Jeffrey Stedfast
parent 9112abc02f
commit a184d302d5
6 changed files with 12 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mail/ChangeLog
View File

@ -1,5 +1,15 @@
2002-02-06 Jeffrey Stedfast <fejj@ximian.com>
* message-list.c: Removed references to NEEDS_REPLY.
* mail-callbacks.c (mark_as_needing_reply): Removed.
(mark_as_not_needing_reply): Removed.
(toggle_need_reply): Removed.
* folder-browser.c (on_right_click): Remove CAN_MARK_NEEDS_REPLY
stuff, this is going to be implemented in an entirely different
way.
* mail-format.c (handle_text_plain): Look for DOCTYPE XML comments
too to decide if the message content is really HTML.

25
mail/folder-browser.c
View File

@ -1426,9 +1426,7 @@ enum {
IS_MAILING_LIST = 1<<6,
CAN_RESEND = 1<<7,
CAN_MARK_IMPORTANT = 1<<8,
CAN_MARK_UNIMPORTANT = 1<<9,
CAN_MARK_NEEDS_REPLY = 1<<10,
CAN_MARK_DOESNT_NEED_REPLY = 1<<11
CAN_MARK_UNIMPORTANT = 1<<9
};
#define MLIST_VFOLDER (3)
@ -1468,8 +1466,6 @@ static EPopupMenu context_menu[] = {
{ N_("Mark as U_nread"), NULL, GTK_SIGNAL_FUNC (mark_as_unseen), NULL, CAN_MARK_UNREAD },
{ N_("Mark as _Important"), NULL, GTK_SIGNAL_FUNC (mark_as_important), NULL, CAN_MARK_IMPORTANT },
{ N_("Mark as Unim_portant"), NULL, GTK_SIGNAL_FUNC (mark_as_unimportant), NULL, CAN_MARK_UNIMPORTANT },
{ N_("Mark as Needing Reply"), NULL, GTK_SIGNAL_FUNC (mark_as_needing_reply), NULL, CAN_MARK_NEEDS_REPLY },
{ N_("Mark as Not Needing Reply"), NULL, GTK_SIGNAL_FUNC (mark_as_not_needing_reply), NULL, CAN_MARK_DOESNT_NEED_REPLY },
E_POPUP_SEPARATOR,
@ -1560,8 +1556,6 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event
gboolean have_unseen = FALSE;
gboolean have_important = FALSE;
gboolean have_unimportant = FALSE;
gboolean have_needs_reply = FALSE;
gboolean have_doesnt_need_reply = FALSE;
for (i = 0; i < uids->len; i++) {
info = camel_folder_get_message_info (fb->folder, uids->pdata[i]);
@ -1583,11 +1577,6 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event
else
have_unimportant = TRUE;
if (info->flags & CAMEL_MESSAGE_NEEDS_REPLY)
have_needs_reply = TRUE;
else
have_doesnt_need_reply = TRUE;
camel_folder_free_message_info (fb->folder, info);
if (have_seen && have_unseen && have_deleted && have_undeleted)
@ -1609,11 +1598,6 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event
if (!have_important)
enable_mask |= CAN_MARK_UNIMPORTANT;
if (!have_needs_reply)
enable_mask |= CAN_MARK_DOESNT_NEED_REPLY;
if (!have_doesnt_need_reply)
enable_mask |= CAN_MARK_NEEDS_REPLY;
/*
* Hide items that wont get used.
*/
@ -1637,13 +1621,6 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event
else
hide_mask |= CAN_MARK_UNIMPORTANT;
}
if (!(have_needs_reply && have_doesnt_need_reply)) {
if (have_needs_reply)
hide_mask |= CAN_MARK_NEEDS_REPLY;
else
hide_mask |= CAN_MARK_DOESNT_NEED_REPLY;
}
}
/* free uids */

21
mail/mail-callbacks.c
View File

@ -1076,7 +1076,7 @@ mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, int mod
psd->folder = folder;
camel_object_ref (CAMEL_OBJECT (psd->folder));
psd->uid = g_strdup (uid);
psd->flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_NEEDS_REPLY;
psd->flags = CAMEL_MESSAGE_ANSWERED;
psd->set = CAMEL_MESSAGE_ANSWERED;
composer = mail_generate_reply (folder, msg, uid, mode);
@ -1807,25 +1807,6 @@ toggle_as_important (BonoboUIComponent *uih, void *user_data, const char *path)
toggle_flags (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED);
}
void
mark_as_needing_reply (BonoboUIComponent *uih, void *user_data, const char *path)
{
flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_DELETED, 0);
flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_NEEDS_REPLY, CAMEL_MESSAGE_NEEDS_REPLY);
}
void
mark_as_not_needing_reply (BonoboUIComponent *uih, void *user_data, const char *path)
{
flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_NEEDS_REPLY, 0);
}
void
toggle_need_reply (BonoboUIComponent *uih, void *user_data, const char *path)
{
toggle_flags (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_NEEDS_REPLY);
}
void
zoom_in (BonoboUIComponent *uih, void *user_data, const char *path)
{

3
mail/mail-callbacks.h
View File

@ -96,9 +96,6 @@ void mark_as_unseen (BonoboUIComponent *uih, void *user_data, const c
void mark_as_important (BonoboUIComponent *uih, void *user_data, const char *path);
void mark_as_unimportant (BonoboUIComponent *uih, void *user_data, const char *path);
void toggle_as_important (BonoboUIComponent *uih, void *user_data, const char *path);
void mark_as_needing_reply (BonoboUIComponent *uih, void *user_data, const char *path);
void mark_as_not_needing_reply (BonoboUIComponent *uih, void *user_data, const char *path);
void toggle_need_reply (BonoboUIComponent *uih, void *user_data, const char *path);
void zoom_in (BonoboUIComponent *uih, void *user_data, const char *path);
void zoom_out (BonoboUIComponent *uih, void *user_data, const char *path);

20
mail/message-list.c
View File

@ -557,7 +557,6 @@ ml_duplicate_value (ETreeModel *etm, int col, const void *value, void *data)
{
switch (col){
case COL_MESSAGE_STATUS:
case COL_NEED_REPLY:
case COL_FLAGGED:
case COL_SCORE:
case COL_ATTACHMENT:
@ -584,7 +583,6 @@ ml_free_value (ETreeModel *etm, int col, void *value, void *data)
{
switch (col){
case COL_MESSAGE_STATUS:
case COL_NEED_REPLY:
case COL_FLAGGED:
case COL_SCORE:
case COL_ATTACHMENT:
@ -610,7 +608,6 @@ ml_initialize_value (ETreeModel *etm, int col, void *data)
{
switch (col){
case COL_MESSAGE_STATUS:
case COL_NEED_REPLY:
case COL_FLAGGED:
case COL_SCORE:
case COL_ATTACHMENT:
@ -637,7 +634,6 @@ ml_value_is_empty (ETreeModel *etm, int col, const void *value, void *data)
{
switch (col){
case COL_MESSAGE_STATUS:
case COL_NEED_REPLY:
case COL_FLAGGED:
case COL_SCORE:
case COL_ATTACHMENT:
@ -666,11 +662,6 @@ static const char *status_map[] = {
N_("Multiple Messages"),
};
static const char *needs_reply_map[] = {
"",
N_("Needs Reply"),
};
static const char *score_map[] = {
N_("Lowest"),
N_("Lower"),
@ -693,10 +684,6 @@ ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data)
return g_strdup("");
return g_strdup(_(status_map[i]));
case COL_NEED_REPLY:
i = (unsigned int)value;
return g_strdup (_(needs_reply_map[i]));
case COL_SCORE:
i = (unsigned int)value + 3;
if (i > 6)
@ -837,8 +824,6 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
return GINT_TO_POINTER (0);
break;
}
case COL_NEED_REPLY:
return GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_NEEDS_REPLY) != 0);
case COL_FLAGGED:
return GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_FLAGGED) != 0);
case COL_SCORE: {
@ -2067,8 +2052,6 @@ on_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, Mess
flag = CAMEL_MESSAGE_SEEN;
else if (col == COL_FLAGGED)
flag = CAMEL_MESSAGE_FLAGGED;
else if (col == COL_NEED_REPLY)
flag = CAMEL_MESSAGE_NEEDS_REPLY;
else
return FALSE;
@ -2085,9 +2068,6 @@ on_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, Mess
if (col == COL_FLAGGED && !(info->flags & CAMEL_MESSAGE_FLAGGED))
flag |= CAMEL_MESSAGE_DELETED;
if (col == COL_NEED_REPLY && !(info->flags & CAMEL_MESSAGE_NEEDS_REPLY))
flag |= CAMEL_MESSAGE_DELETED;
if (col == COL_MESSAGE_STATUS && (info->flags & CAMEL_MESSAGE_SEEN))
flag |= CAMEL_MESSAGE_DELETED;

1
mail/message-list.etspec
View File

@ -10,7 +10,6 @@
<ETableColumn model_col= "7" _title="Received" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/>
<ETableColumn model_col= "8" _title="To" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare"/>
<ETableColumn model_col= "9" _title="Size" expansion="0.2" minimum_width="32" resizable="true" cell="render_size" compare="integer"/>
<ETableColumn model_col="10" _title="Needs Reply" pixbuf="needsreply" expansion="0.0" minimum_width="18" resizable="false" cell="render_needs_reply" compare="integer" sortable="false"/>
<ETableState>
<column source="0"/> <column source="3"/> <column source="1"/>
<column source="4"/> <column source="5" expansion="1.60"/> <column source="6" expansion="0.40"/>