gnome_pixmap -> gtkimage. (construct): gtk_clist -> gtk_tree_view, setup

2002-11-27  Not Zed  <NotZed@Ximian.com>

        * message-tag-followup.c (construct): gnome_pixmap -> gtkimage.
        (construct): gtk_clist -> gtk_tree_view, setup columns.  They dont
        size well :-/
        (message_tag_followup_append_message): Append using model, remove
        clist stuff.
        (construct): Show date edit (glade bugs?)

        * folder-browser.c (folder_browser_class_init): gtk_marshal -> g_cclosure_marshal
        (setup_popup_icons): gnome_pixmap -> gtk_image.
        (on_right_click): gtk_pixmap -> gtk_image.

        * mail-accounts.c (account_delete_clicked): removed #if 0'd out code.

        * mail-send-recv.c (receive_done): remove FIXME and extra unref.

        * mail-session.c (request_password): Removed #if 0'd out stuff.

        * mail-vfolder.c (new_rule_clicked): proper cast for g_object_get_data.

        * mail-local.c (reconfigure_response): cast for g_object_get_data.

        * mail-account-editor.c (construct): GNOME_DIALOG -> GTK_DIALOG.

        * *.[ch]: re-ran fix.sh for e_notice change

        * mail-callbacks.c (save_msg_ok): g_object_get_data +
        gtk_object_remove_no_notify -> g_object_steal_data.
        (find_socket): gtk_container_children ->
        gtk_container_get_children
        (edit_msg): gnome_*_dialog -> gtk_message_dialog.
        (resent_msg): "
        (search_msg): "
        (confirm_goto_next_folder): gtkmessagedialogised (even if not
        used).
        (confirm_expunge): gtkmessagedialogised
        (filter_edit): "
        (do_mail_print): e_notice -> gtk_message_dialog.
        (are_you_sure): removed e_gnome_ok_cancel_dialog crap, replaced
        with a gtk dialog.
        (are_you_sure): gtkmessagedialogised.
        (edit_msg_internal): Dont free uids array, are_you_sure() free's
        it.
        (resend_msg): Same.
        (check_send_configuration): Use e_notice for stuff.  Sigh, here we
        go again ...!
        (e_question): A utility function to ask a question, potentially
        with 'dont ask again' as well.
        (configure_mail): use e_question to save code.  Here we go again,
        again ...
        (ask_confirm_for_unwanted_html_mail): "
        (ask_confirm_for_only_bcc): "
        (ask_confirm_for_only_bcc): "
        (composer_get_message): Use e_notice.
        (composer_save_draft_cb): Use e_question
        (edit_msg): use e_notice, & change to an ERROR.
        (resend_msg): same.
        (save_msg_ok): Properly initialise ret to OK, and use e_question,
        and use access() to determine existance/write access rather than
        stat, display an error if we can't write to a file that exists,
        and print the filename in all dialogues.
        (confirm_goto_next_folder): Use e_question.
        (confirm_expunge): use e_question.
        (filter_edit): Use e_notice.
        (do_mail_print): use e_notice.

svn path=/trunk/; revision=18974

1 files changed, 27 insertions, 13 deletions

diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 861742f16d..19b6ff78df 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -237,7 +237,9 @@ construct (MessageTagEditor *editor)
 	GList *strings;
 	GladeXML *gui;
 	int i;
-	
+	GtkListStore *model;
+	GtkCellRenderer *text;
+
 	gtk_window_set_title (GTK_WINDOW (editor), _("Flag to Follow Up"));
 	gnome_window_icon_set_from_file (GTK_WINDOW (editor), EVOLUTION_IMAGES "/flag-for-followup-16.png");
 	
@@ -249,10 +251,20 @@ construct (MessageTagEditor *editor)
 	gtk_widget_reparent (widget, GTK_DIALOG (editor)->vbox);
 	
 	widget = glade_xml_get_widget (gui, "pixmap");
-	gnome_pixmap_load_file (GNOME_PIXMAP (widget), EVOLUTION_GLADEDIR "/flag-for-followup-48.png");
-	
-	followup->message_list = GTK_CLIST (glade_xml_get_widget (gui, "message_list"));
-	
+	gtk_image_set_from_file ((GtkImage *)widget, EVOLUTION_GLADEDIR "/flag-for-followup-48.png");
+	
+	followup->message_list = GTK_TREE_VIEW (glade_xml_get_widget (gui, "message_list"));
+	model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+	gtk_tree_view_set_model (followup->message_list, (GtkTreeModel *) model);
+	gtk_tree_view_insert_column_with_attributes(followup->message_list, -1, _("From"),
+						    (text = gtk_cell_renderer_text_new()),
+						    "text", 0,
+						    NULL);
+	gtk_tree_view_insert_column_with_attributes(followup->message_list, -1, _("Subject"),
+						    text,
+						    "text", 1,
+						    NULL);
+
 	followup->combo = GTK_COMBO (glade_xml_get_widget (gui, "combo"));
 	gtk_combo_set_case_sensitive (followup->combo, FALSE);
 	strings = NULL;
@@ -263,6 +275,8 @@ construct (MessageTagEditor *editor)
 	gtk_list_select_item (GTK_LIST (followup->combo->list), DEFAULT_FLAG);
 	
 	followup->target_date = E_DATE_EDIT (glade_xml_get_widget (gui, "target_date"));
+	/* glade bug, need to show this ourselves */
+	gtk_widget_show((GtkWidget *)followup->target_date);
 	e_date_edit_set_time (followup->target_date, (time_t) -1);
 	
 	followup->completed = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "completed"));
@@ -290,13 +304,13 @@ message_tag_followup_append_message (MessageTagFollowUp *editor,
 				     const char *from,
 				     const char *subject)
 {
-	char *text[3];
-	
+	GtkTreeIter iter;
+	GtkListStore *model;
+
 	g_return_if_fail (IS_MESSAGE_TAG_FOLLOWUP (editor));
-	
-	text[0] = (char *)from;
-	text[1] = (char *)subject;
-	text[2] = NULL;
-	
-	gtk_clist_append (editor->message_list, text);
+
+	model = (GtkListStore *)gtk_tree_view_get_model(editor->message_list);
+
+	gtk_list_store_append (model, &iter);
+	gtk_list_store_set(model, &iter, 0, from, 1, subject, -1);
 }