From 34a090e9bd521dcbadecd1c0ac9a15b344df9d67 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 18 Feb 2004 20:55:47 +0000 Subject: Changed the name to not imply we are working with a GtkCList widget (since 2004-02-18 Jeffrey Stedfast * em-composer-prefs.c (sig_fill_list): Changed the name to not imply we are working with a GtkCList widget (since we are using a GtkTreeView). svn path=/trunk/; revision=24788 --- mail/ChangeLog | 4 ++ mail/em-composer-prefs.c | 16 +++--- mail/mail-config.glade | 129 +---------------------------------------------- 3 files changed, 12 insertions(+), 137 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index d68f31dca7..65a98e0337 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,9 @@ 2004-02-18 Jeffrey Stedfast + * em-composer-prefs.c (sig_fill_list): Changed the name to not + imply we are working with a GtkCList widget (since we are using a + GtkTreeView). + * em-folder-tree.c (emft_tree_button_press): Pass flags to em_popup_target_new_folder() instead of just an isstore arg. (emft_tree_button_press): Fake the fi flags for vTrash/vJunk so diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index f3f052db58..aaa3a623f9 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -377,13 +377,13 @@ sig_selection_changed (GtkTreeSelection *selection, EMComposerPrefs *prefs) } static void -sig_fill_clist (GtkTreeView *clist) +sig_fill_list (GtkTreeView *list) { GSList *l; GtkListStore *model; GtkTreeIter iter; - model = (GtkListStore *) gtk_tree_view_get_model (clist); + model = (GtkListStore *) gtk_tree_view_get_model (list); gtk_list_store_clear (model); for (l = mail_config_get_signature_list (); l; l = l->next) { @@ -852,7 +852,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) /* Spell Checking: GNOME Spell part */ prefs->colour = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerSpellCheckColor")); - prefs->language = GTK_TREE_VIEW (glade_xml_get_widget (gui, "clistSpellCheckLanguage")); + prefs->language = GTK_TREE_VIEW (glade_xml_get_widget (gui, "listSpellCheckLanguage")); model = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER); gtk_tree_view_set_model (prefs->language, (GtkTreeModel *) model); gtk_tree_view_insert_column_with_attributes (prefs->language, -1, _("Enabled"), @@ -866,11 +866,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) selection = gtk_tree_view_get_selection (prefs->language); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); g_signal_connect (selection, "changed", G_CALLBACK (spell_language_selection_changed), prefs); -#if 0 - gtk_clist_set_column_justification (prefs->language, 0, GTK_JUSTIFY_RIGHT); - gtk_clist_set_column_auto_resize (prefs->language, 0, TRUE); -#endif - + prefs->spell_able_button = glade_xml_get_widget (gui, "buttonSpellCheckEnable"); info_pixmap = glade_xml_get_widget (gui, "pixmapSpellInfo"); gtk_image_set_from_file (GTK_IMAGE (info_pixmap), EVOLUTION_IMAGES "/info-bulb.png"); @@ -918,7 +914,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) prefs->sig_delete = GTK_BUTTON (glade_xml_get_widget (gui, "cmdSignatureDelete")); g_signal_connect (prefs->sig_delete, "clicked", G_CALLBACK (sig_delete_cb), prefs); - prefs->sig_list = GTK_TREE_VIEW (glade_xml_get_widget (gui, "clistSignatures")); + prefs->sig_list = GTK_TREE_VIEW (glade_xml_get_widget (gui, "listSignatures")); model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); gtk_tree_view_set_model (prefs->sig_list, (GtkTreeModel *)model); gtk_tree_view_insert_column_with_attributes (prefs->sig_list, -1, _("Signature(s)"), @@ -929,7 +925,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); g_signal_connect (selection, "changed", G_CALLBACK (sig_selection_changed), prefs); - sig_fill_clist (prefs->sig_list); + sig_fill_list (prefs->sig_list); if (mail_config_get_signature_list () == NULL) { gtk_widget_set_sensitive ((GtkWidget *) prefs->sig_delete, FALSE); gtk_widget_set_sensitive ((GtkWidget *) prefs->sig_edit, FALSE); diff --git a/mail/mail-config.glade b/mail/mail-config.glade index acbe97b79c..f81eeeaf55 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -11,11 +11,6 @@ False True False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST @@ -163,11 +158,6 @@ Click "Apply" to save your settings. False True False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST @@ -291,7 +281,6 @@ For example: "Work" or "Personal" _Make this my default account True GTK_RELIEF_NORMAL - True False False True @@ -641,7 +630,6 @@ For example: "Work" or "Personal" Add new signature... True GTK_RELIEF_NORMAL - True @@ -1275,10 +1263,6 @@ For example: "Work" or "Personal" 0.5 1 1 - 0 - 0 - 0 - 0 @@ -1287,7 +1271,6 @@ For example: "Work" or "Personal" _Check for supported types True GTK_RELIEF_NORMAL - True @@ -1313,7 +1296,6 @@ For example: "Work" or "Personal" Re_member this password True GTK_RELIEF_NORMAL - True False False True @@ -1452,7 +1434,6 @@ For example: "Work" or "Personal" _Automatically check for new mail every True GTK_RELIEF_NORMAL - True False False True @@ -1904,7 +1885,6 @@ For example: "Work" or "Personal" Ser_ver requires authentication True GTK_RELIEF_NORMAL - True False False True @@ -2028,10 +2008,6 @@ For example: "Work" or "Personal" 0.5 1 1 - 0 - 0 - 0 - 0 @@ -2040,7 +2016,6 @@ For example: "Work" or "Personal" _Check for supported types True GTK_RELIEF_NORMAL - True @@ -2120,7 +2095,6 @@ For example: "Work" or "Personal" Remember this _password True GTK_RELIEF_NORMAL - True False False True @@ -2313,7 +2287,6 @@ For example: "Work" or "Personal" Restore Defaults True GTK_RELIEF_NORMAL - True 1 @@ -2389,7 +2362,6 @@ For example: "Work" or "Personal" Always _carbon-copy (Cc) to: True GTK_RELIEF_NORMAL - True False False True @@ -2411,7 +2383,6 @@ For example: "Work" or "Personal" Always _blind carbon-copy (Bcc) to: True GTK_RELIEF_NORMAL - True False False True @@ -2631,7 +2602,6 @@ For example: "Work" or "Personal" _Always sign outgoing messages when using this account True GTK_RELIEF_NORMAL - True False False True @@ -2650,7 +2620,6 @@ For example: "Work" or "Personal" Don't sign _meeting requests (for Outlook compatibility) True GTK_RELIEF_NORMAL - True False False True @@ -2669,7 +2638,6 @@ For example: "Work" or "Personal" Al_ways encrypt to myself when sending encrypted mail True GTK_RELIEF_NORMAL - True True False True @@ -2688,7 +2656,6 @@ For example: "Work" or "Personal" Always _trust keys in my keyring when encrypting True GTK_RELIEF_NORMAL - True False False True @@ -2848,7 +2815,6 @@ For example: "Work" or "Personal" True True GTK_RELIEF_NORMAL - True @@ -2857,10 +2823,6 @@ For example: "Work" or "Personal" 0.5 0 0 - 0 - 0 - 0 - 0 @@ -2925,7 +2887,6 @@ For example: "Work" or "Personal" True True GTK_RELIEF_NORMAL - True @@ -2934,10 +2895,6 @@ For example: "Work" or "Personal" 0.5 0 0 - 0 - 0 - 0 - 0 @@ -3004,7 +2961,6 @@ For example: "Work" or "Personal" gtk-clear True GTK_RELIEF_NORMAL - True 3 @@ -3023,7 +2979,6 @@ For example: "Work" or "Personal" gtk-clear True GTK_RELIEF_NORMAL - True 3 @@ -3042,7 +2997,6 @@ For example: "Work" or "Personal" A_lso encrypt to self when sending encrypted mail True GTK_RELIEF_NORMAL - True False False True @@ -3064,7 +3018,6 @@ For example: "Work" or "Personal" _Encrypt outgoing messages (by default) True GTK_RELIEF_NORMAL - True False False True @@ -3101,7 +3054,6 @@ For example: "Work" or "Personal" Digitally _sign outgoing messages (by default) True GTK_RELIEF_NORMAL - True False False True @@ -3186,11 +3138,6 @@ For example: "Work" or "Personal" False True False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST @@ -3256,7 +3203,6 @@ For example: "Work" or "Personal" gtk-add True GTK_RELIEF_NORMAL - True @@ -3269,7 +3215,6 @@ For example: "Work" or "Personal" _Edit True GTK_RELIEF_NORMAL - True @@ -3282,7 +3227,6 @@ For example: "Work" or "Personal" gtk-remove True GTK_RELIEF_NORMAL - True @@ -3330,7 +3274,6 @@ For example: "Work" or "Personal" De_fault True GTK_RELIEF_NORMAL - True @@ -3343,7 +3286,6 @@ For example: "Work" or "Personal" E_nable True GTK_RELIEF_NORMAL - True @@ -3371,11 +3313,6 @@ For example: "Work" or "Personal" False True False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST @@ -3415,7 +3352,6 @@ For example: "Work" or "Personal" _Use the same fonts as other applications True GTK_RELIEF_NORMAL - True False False True @@ -3470,7 +3406,6 @@ For example: "Work" or "Personal" True False 14 - True @@ -3492,7 +3427,6 @@ For example: "Work" or "Personal" True False 14 - True @@ -3592,7 +3526,6 @@ For example: "Work" or "Personal" _Mark messages as read after True GTK_RELIEF_NORMAL - True False False True @@ -3734,7 +3667,6 @@ For example: "Work" or "Personal" Highlight _quotations with True GTK_RELIEF_NORMAL - True True False True @@ -3753,7 +3685,6 @@ For example: "Work" or "Personal" True False Pick a color - True 0 @@ -3839,7 +3770,6 @@ For example: "Work" or "Personal" Empty _trash folders on exit True GTK_RELIEF_NORMAL - True False False True @@ -3858,7 +3788,6 @@ For example: "Work" or "Personal" _Confirm when expunging a folder True GTK_RELIEF_NORMAL - True False False True @@ -3919,7 +3848,6 @@ For example: "Work" or "Personal" _Do not notify me when new mail arrives True GTK_RELIEF_NORMAL - True True False True @@ -3938,7 +3866,6 @@ For example: "Work" or "Personal" _Beep when new mail arrives True GTK_RELIEF_NORMAL - True False False True @@ -3958,7 +3885,6 @@ For example: "Work" or "Personal" _Play sound file when new mail arrives True GTK_RELIEF_NORMAL - True False False True @@ -4117,7 +4043,6 @@ For example: "Work" or "Personal" _Never load images off the net True GTK_RELIEF_NORMAL - True True False True @@ -4136,7 +4061,6 @@ For example: "Work" or "Personal" _Load images if sender is in address book True GTK_RELIEF_NORMAL - True False False True @@ -4156,7 +4080,6 @@ For example: "Work" or "Personal" _Always load images off the net True GTK_RELIEF_NORMAL - True False False True @@ -4204,7 +4127,6 @@ For example: "Work" or "Personal" _Show animated images True GTK_RELIEF_NORMAL - True False False True @@ -4223,7 +4145,6 @@ For example: "Work" or "Personal" _Prompt when sending HTML messages to contacts that don't want them True GTK_RELIEF_NORMAL - True False False True @@ -4291,7 +4212,6 @@ For example: "Work" or "Personal" True False Pick a color - True 1 @@ -4310,7 +4230,6 @@ For example: "Work" or "Personal" True False Pick a color - True 1 @@ -4329,7 +4248,6 @@ For example: "Work" or "Personal" True False Pick a color - True 1 @@ -4348,7 +4266,6 @@ For example: "Work" or "Personal" True False Pick a color - True 1 @@ -4367,7 +4284,6 @@ For example: "Work" or "Personal" True False Pick a color - True 1 @@ -4496,7 +4412,6 @@ For example: "Work" or "Personal" _Restore defaults True GTK_RELIEF_NORMAL - True 2 @@ -4670,7 +4585,6 @@ For example: "Work" or "Personal" gtk-add True GTK_RELIEF_NORMAL - True 6 @@ -4686,7 +4600,6 @@ For example: "Work" or "Personal" gtk-remove True GTK_RELIEF_NORMAL - True 0 @@ -4755,7 +4668,6 @@ For example: "Work" or "Personal" Check _Incoming Mail True GTK_RELIEF_NORMAL - True False False True @@ -4801,7 +4713,6 @@ For example: "Work" or "Personal" Do _Not Check Incoming Mail For IMAP Accounts True GTK_RELIEF_NORMAL - True False False True @@ -4848,7 +4759,6 @@ For example: "Work" or "Personal" _Local Tests Only True GTK_RELIEF_NORMAL - True False False True @@ -4867,7 +4777,6 @@ For example: "Work" or "Personal" Use _Daemon True GTK_RELIEF_NORMAL - True False False True @@ -4942,11 +4851,6 @@ For example: "Work" or "Personal" False True False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST @@ -5043,10 +4947,6 @@ For example: "Work" or "Personal" 0.5 0 1 - 0 - 0 - 0 - 0 @@ -5245,7 +5145,6 @@ For example: "Work" or "Personal" Format messages in _HTML True GTK_RELIEF_NORMAL - True False False True @@ -5264,7 +5163,6 @@ For example: "Work" or "Personal" _Automatically insert smiley images True GTK_RELIEF_NORMAL - True False False True @@ -5325,7 +5223,6 @@ For example: "Work" or "Personal" _Prompt when sending messages with an empty subject line True GTK_RELIEF_NORMAL - True False False True @@ -5344,7 +5241,6 @@ For example: "Work" or "Personal" Pr_ompt when sending messages with only Bcc recipients defined True GTK_RELIEF_NORMAL - True False False True @@ -5432,7 +5328,7 @@ For example: "Work" or "Personal" GTK_CORNER_TOP_LEFT - + True True True @@ -5490,7 +5386,6 @@ For example: "Work" or "Personal" gtk-add True GTK_RELIEF_NORMAL - True @@ -5502,7 +5397,6 @@ For example: "Work" or "Personal" Add Sc_ript True GTK_RELIEF_NORMAL - True @@ -5515,7 +5409,6 @@ For example: "Work" or "Personal" _Edit True GTK_RELIEF_NORMAL - True @@ -5527,7 +5420,6 @@ For example: "Work" or "Personal" gtk-remove True GTK_RELIEF_NORMAL - True @@ -5700,7 +5592,7 @@ For example: "Work" or "Personal" GTK_CORNER_TOP_LEFT - + True True True @@ -5761,7 +5653,6 @@ For example: "Work" or "Personal" _Enable True GTK_RELIEF_NORMAL - True @@ -5808,7 +5699,6 @@ For example: "Work" or "Personal" Check spelling while I _type True GTK_RELIEF_NORMAL - True False False True @@ -5855,7 +5745,6 @@ For example: "Work" or "Personal" True False Pick a color - True @@ -5935,11 +5824,6 @@ For example: "Work" or "Personal" False True False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST @@ -6028,7 +5912,6 @@ For example: "Work" or "Personal" True False 14 - True @@ -6050,7 +5933,6 @@ For example: "Work" or "Personal" True False 14 - True @@ -6101,11 +5983,6 @@ For example: "Work" or "Personal" False True False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST True @@ -6127,7 +6004,6 @@ For example: "Work" or "Personal" _Add Signature True GTK_RELIEF_NORMAL - True 0 @@ -6140,7 +6016,6 @@ For example: "Work" or "Personal" gtk-cancel True GTK_RELIEF_NORMAL - True 0 -- cgit v1.2.3