Get rid of the ETable #ifdef's - we won't ever be using ETable.
2002-12-12 Jeffrey Stedfast <fejj@ximian.com> * mail-accounts.c (account_delete_clicked): Get rid of the ETable #ifdef's - we won't ever be using ETable. (account_default_clicked): Same. (account_able_clicked): Here too. (mail_accounts_load): And here. (mail_accounts_treeview_new): Renamed from etable_new since we won't ever be using an etable. (mail_accounts_tab_construct): And finally here. svn path=/trunk/; revision=19104
This commit is contained in:
Jeffrey Stedfast
committed by
Jeffrey Stedfast
Jeffrey Stedfast
parent
a2ce61bbf1
commit
159b10f3d9
@ -1,3 +1,14 @@
|
||||
2002-12-12 Jeffrey Stedfast <fejj@ximian.com>
|
||||
|
||||
* mail-accounts.c (account_delete_clicked): Get rid of the ETable
|
||||
#ifdef's - we won't ever be using ETable.
|
||||
(account_default_clicked): Same.
|
||||
(account_able_clicked): Here too.
|
||||
(mail_accounts_load): And here.
|
||||
(mail_accounts_treeview_new): Renamed from etable_new since we
|
||||
won't ever be using an etable.
|
||||
(mail_accounts_tab_construct): And finally here.
|
||||
|
||||
2002-12-12 Not Zed <NotZed@Ximian.com>
|
||||
|
||||
* folder-browser.c (my_folder_browser_init): cast a-warning a-way.
|
||||
|
||||
@ -27,13 +27,6 @@
|
||||
|
||||
#include "mail-accounts.h"
|
||||
|
||||
#define USE_ETABLE 0
|
||||
|
||||
#ifdef USE_ETABLE
|
||||
#include <gal/e-table/e-table-memory-store.h>
|
||||
#include <gal/e-table/e-table-scrolled.h>
|
||||
#include <gal/e-table/e-cell-toggle.h>
|
||||
#endif
|
||||
#include <camel/camel-url.h>
|
||||
|
||||
#include <gtk/gtkliststore.h>
|
||||
@ -178,13 +171,6 @@ account_edit_clicked (GtkButton *button, gpointer user_data)
|
||||
|
||||
if (prefs->editor == NULL) {
|
||||
MailConfigAccount *account = NULL;
|
||||
#if USE_ETABLE
|
||||
int row;
|
||||
|
||||
row = e_table_get_cursor_row (prefs->table);
|
||||
if (row >=0)
|
||||
account = e_table_memory_get_data (E_TABLE_MEMORY (prefs->model), row);
|
||||
#else
|
||||
GtkTreeSelection *selection;
|
||||
GtkTreeModel *model;
|
||||
GtkTreeIter iter;
|
||||
@ -192,7 +178,7 @@ account_edit_clicked (GtkButton *button, gpointer user_data)
|
||||
selection = gtk_tree_view_get_selection (prefs->table);
|
||||
if (gtk_tree_selection_get_selected (selection, &model, &iter))
|
||||
gtk_tree_model_get (model, &iter, 3, &account, -1);
|
||||
#endif
|
||||
|
||||
if (account) {
|
||||
GtkWidget *window;
|
||||
|
||||
@ -212,42 +198,36 @@ account_delete_clicked (GtkButton *button, gpointer user_data)
|
||||
{
|
||||
MailAccountsTab *prefs = user_data;
|
||||
const MailConfigAccount *account = NULL;
|
||||
GtkDialog *confirm;
|
||||
GtkButton *tmp;
|
||||
const GSList *list;
|
||||
int ans;
|
||||
|
||||
#if USE_ETABLE
|
||||
int row;
|
||||
|
||||
row = e_table_get_cursor_row (prefs->table);
|
||||
if (row >=0)
|
||||
account = e_table_memory_get_data (E_TABLE_MEMORY (prefs->model), row);
|
||||
#else
|
||||
GtkWidget *confirm, *button;
|
||||
GtkTreeSelection *selection;
|
||||
GtkTreeModel *model;
|
||||
const GSList *list;
|
||||
GtkTreeIter iter;
|
||||
int ans;
|
||||
|
||||
selection = gtk_tree_view_get_selection (prefs->table);
|
||||
if (gtk_tree_selection_get_selected (selection, &model, &iter))
|
||||
gtk_tree_model_get (model, &iter, 3, &account, -1);
|
||||
#endif
|
||||
|
||||
/* make sure we have a valid account selected and that we aren't editing anything... */
|
||||
if (account == NULL || prefs->editor != NULL)
|
||||
return;
|
||||
|
||||
confirm = (GtkDialog *)gtk_message_dialog_new(PREFS_WINDOW (prefs),
|
||||
confirm = gtk_message_dialog_new (PREFS_WINDOW (prefs),
|
||||
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
|
||||
_("Are you sure you want to delete this account?"));
|
||||
tmp = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_YES);
|
||||
gtk_button_set_label(tmp, _("Delete"));
|
||||
gtk_dialog_add_action_widget(confirm, (GtkWidget *)tmp, GTK_RESPONSE_YES);
|
||||
tmp = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_NO);
|
||||
gtk_button_set_label(tmp, _("Don't delete"));
|
||||
gtk_dialog_add_action_widget(confirm, (GtkWidget *)tmp, GTK_RESPONSE_NO);
|
||||
ans = gtk_dialog_run(confirm);
|
||||
gtk_widget_destroy((GtkWidget *)confirm);
|
||||
|
||||
button = gtk_button_new_from_stock (GTK_STOCK_YES);
|
||||
gtk_button_set_label ((GtkButton *) button, _("Delete"));
|
||||
gtk_dialog_add_action_widget ((GtkDialog *) confirm, button, GTK_RESPONSE_YES);
|
||||
|
||||
button = gtk_button_new_from_stock (GTK_STOCK_NO);
|
||||
gtk_button_set_label ((GtkButton *) button, _("Don't delete"));
|
||||
gtk_dialog_add_action_widget ((GtkDialog *) confirm, button, GTK_RESPONSE_NO);
|
||||
|
||||
ans = gtk_dialog_run ((GtkDialog *) confirm);
|
||||
gtk_widget_destroy (confirm);
|
||||
g_object_unref (confirm);
|
||||
|
||||
if (ans == GTK_RESPONSE_YES) {
|
||||
@ -264,19 +244,11 @@ account_delete_clicked (GtkButton *button, gpointer user_data)
|
||||
|
||||
mail_autoreceive_setup ();
|
||||
|
||||
#if USE_ETABLE
|
||||
e_table_memory_store_remove (E_TABLE_MEMORY_STORE (prefs->model), row);
|
||||
#else
|
||||
gtk_list_store_remove ((GtkListStore *) model, &iter);
|
||||
#endif
|
||||
|
||||
len = list ? g_slist_length ((GSList *) list) : 0;
|
||||
if (len > 0) {
|
||||
#if USE_ETABLE
|
||||
e_table_set_cursor_row (prefs->table, row >= len ? len - 1 : row);
|
||||
#else
|
||||
gtk_tree_selection_select_iter (selection, &iter);
|
||||
#endif
|
||||
} else {
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_edit), FALSE);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_delete), FALSE);
|
||||
@ -291,22 +263,14 @@ account_default_clicked (GtkButton *button, gpointer user_data)
|
||||
{
|
||||
MailAccountsTab *prefs = user_data;
|
||||
const MailConfigAccount *account = NULL;
|
||||
int row;
|
||||
|
||||
#if USE_ETABLE
|
||||
row = e_table_get_cursor_row (prefs->table);
|
||||
if (row >= 0)
|
||||
account = e_table_memory_get_data (E_TABLE_MEMORY (prefs->model), row);
|
||||
|
||||
#else
|
||||
GtkTreeSelection *selection;
|
||||
GtkTreeModel *model;
|
||||
GtkTreeIter iter;
|
||||
int row;
|
||||
|
||||
selection = gtk_tree_view_get_selection (prefs->table);
|
||||
if (gtk_tree_selection_get_selected (selection, &model, &iter))
|
||||
gtk_tree_model_get (model, &iter, 3, &account, -1);
|
||||
#endif
|
||||
|
||||
if (account) {
|
||||
mail_config_set_default_account (account);
|
||||
@ -322,15 +286,6 @@ account_able_clicked (GtkButton *button, gpointer user_data)
|
||||
{
|
||||
MailAccountsTab *prefs = user_data;
|
||||
const MailConfigAccount *account = NULL;
|
||||
#if USE_ETABLE
|
||||
int row;
|
||||
|
||||
row = e_table_get_cursor_row (prefs->table);
|
||||
if (row >= 0) {
|
||||
account = e_table_memory_get_data (E_TABLE_MEMORY (prefs->model), row);
|
||||
account->source->enabled = !account->source->enabled;
|
||||
}
|
||||
#else
|
||||
GtkTreeSelection *selection;
|
||||
GtkTreeModel *model;
|
||||
GtkTreeIter iter;
|
||||
@ -341,7 +296,7 @@ account_able_clicked (GtkButton *button, gpointer user_data)
|
||||
account->source->enabled = !account->source->enabled;
|
||||
gtk_list_store_set ((GtkListStore *) model, &iter, 0, account->source->enabled, -1);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (account) {
|
||||
/* if the account got disabled, remove it from the
|
||||
folder-tree, otherwise add it to the folder-tree */
|
||||
@ -351,53 +306,19 @@ account_able_clicked (GtkButton *button, gpointer user_data)
|
||||
else
|
||||
mail_remove_storage_by_uri (account->source->url);
|
||||
}
|
||||
|
||||
mail_autoreceive_setup ();
|
||||
|
||||
mail_config_write ();
|
||||
}
|
||||
}
|
||||
|
||||
#if USE_ETABLE
|
||||
static void
|
||||
account_cursor_change (ETable *table, int row, gpointer user_data)
|
||||
{
|
||||
MailAccountsTab *prefs = user_data;
|
||||
|
||||
if (row >= 0) {
|
||||
const MailConfigAccount *account;
|
||||
|
||||
account = e_table_memory_get_data (E_TABLE_MEMORY (prefs->model), row);
|
||||
if (account->source && account->source->enabled)
|
||||
gtk_label_set_text (GTK_LABEL (GTK_BIN (prefs->mail_able)->child), _("Disable"));
|
||||
else
|
||||
gtk_label_set_text (GTK_LABEL (GTK_BIN (prefs->mail_able)->child), _("Enable"));
|
||||
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_edit), TRUE);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_delete), TRUE);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_default), TRUE);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_able), TRUE);
|
||||
} else {
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_edit), FALSE);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_delete), FALSE);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_default), FALSE);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_able), FALSE);
|
||||
|
||||
gtk_widget_grab_focus (GTK_WIDGET (prefs->mail_add));
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
account_double_click (ETable *table, int row, int col, GdkEvent *event, gpointer user_data)
|
||||
{
|
||||
account_edit_clicked (NULL, user_data);
|
||||
}
|
||||
#else
|
||||
static void
|
||||
account_cursor_change (GtkTreeSelection *selection, MailAccountsTab *prefs)
|
||||
{
|
||||
const MailConfigAccount *account;
|
||||
GtkTreeModel *model;
|
||||
GtkTreeIter iter;
|
||||
const MailConfigAccount *account;
|
||||
int state;
|
||||
|
||||
state = gtk_tree_selection_get_selected (selection, &model, &iter);
|
||||
@ -420,30 +341,21 @@ account_cursor_change (GtkTreeSelection *selection, MailAccountsTab *prefs)
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_default), state);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_able), state);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static void
|
||||
mail_accounts_load (MailAccountsTab *prefs)
|
||||
{
|
||||
const GSList *node;
|
||||
int row = 0;
|
||||
|
||||
#if USE_ETABLE
|
||||
e_table_memory_freeze (E_TABLE_MEMORY (prefs->model));
|
||||
|
||||
e_table_memory_store_clear (E_TABLE_MEMORY_STORE (prefs->model));
|
||||
#else
|
||||
GtkTreeIter iter;
|
||||
GtkListStore *model;
|
||||
const MailConfigAccount *default_account;
|
||||
GtkListStore *model;
|
||||
const GSList *node;
|
||||
GtkTreeIter iter;
|
||||
char *name, *val;
|
||||
int row = 0;
|
||||
|
||||
model = (GtkListStore *) gtk_tree_view_get_model (prefs->table);
|
||||
gtk_list_store_clear (model);
|
||||
|
||||
default_account = mail_config_get_default_account ();
|
||||
#endif
|
||||
|
||||
node = mail_config_get_accounts ();
|
||||
while (node) {
|
||||
@ -454,14 +366,6 @@ mail_accounts_load (MailAccountsTab *prefs)
|
||||
|
||||
url = account->source && account->source->url ? camel_url_new (account->source->url, NULL) : NULL;
|
||||
|
||||
#if USE_ETABLE
|
||||
e_table_memory_store_insert_list (E_TABLE_MEMORY_STORE (prefs->model),
|
||||
row, GINT_TO_POINTER (account->source->enabled),
|
||||
account->name,
|
||||
url && url->protocol ? url->protocol : U_("None"));
|
||||
|
||||
e_table_memory_set_data (E_TABLE_MEMORY (prefs->model), row, (gpointer) account);
|
||||
#else
|
||||
gtk_list_store_append (model, &iter);
|
||||
if (account == default_account) {
|
||||
/* translators: default account indicator */
|
||||
@ -478,7 +382,6 @@ mail_accounts_load (MailAccountsTab *prefs)
|
||||
3, account,
|
||||
-1);
|
||||
g_free (name);
|
||||
#endif
|
||||
|
||||
if (url)
|
||||
camel_url_free (url);
|
||||
@ -486,50 +389,21 @@ mail_accounts_load (MailAccountsTab *prefs)
|
||||
node = node->next;
|
||||
row++;
|
||||
}
|
||||
|
||||
#if USE_ETABLE
|
||||
e_table_memory_thaw (E_TABLE_MEMORY (prefs->model));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
GtkWidget *mail_accounts_etable_new (char *widget_name, char *string1, char *string2,
|
||||
GtkWidget *mail_accounts_treeview_new (char *widget_name, char *string1, char *string2,
|
||||
int int1, int int2);
|
||||
|
||||
#if USE_ETABLE
|
||||
GtkWidget *
|
||||
mail_accounts_etable_new (char *widget_name, char *string1, char *string2, int int1, int int2)
|
||||
{
|
||||
ETableModel *model;
|
||||
ETableExtras *extras;
|
||||
GdkPixbuf *images[2];
|
||||
ETableMemoryStoreColumnInfo columns[] = {
|
||||
E_TABLE_MEMORY_STORE_INTEGER,
|
||||
E_TABLE_MEMORY_STORE_STRING,
|
||||
E_TABLE_MEMORY_STORE_STRING,
|
||||
E_TABLE_MEMORY_STORE_TERMINATOR,
|
||||
};
|
||||
|
||||
extras = e_table_extras_new ();
|
||||
|
||||
images[0] = disabled_pixbuf; /* disabled */
|
||||
images[1] = enabled_pixbuf; /* enabled */
|
||||
e_table_extras_add_cell (extras, "render_able", e_cell_toggle_new (0, 2, images));
|
||||
|
||||
model = e_table_memory_store_new (columns);
|
||||
|
||||
return e_table_scrolled_new_from_spec_file (model, extras, EVOLUTION_ETSPECDIR "/mail-accounts.etspec", NULL);
|
||||
}
|
||||
#else
|
||||
GtkWidget *
|
||||
mail_accounts_etable_new (char *widget_name, char *string1, char *string2, int int1, int int2)
|
||||
mail_accounts_treeview_new (char *widget_name, char *string1, char *string2, int int1, int int2)
|
||||
{
|
||||
GtkWidget *table, *scrolled;
|
||||
char *titles[3];
|
||||
GtkListStore *model;
|
||||
GtkCellRenderer *renderer;
|
||||
GtkTreeSelection *selection;
|
||||
GtkCellRenderer *renderer;
|
||||
GtkListStore *model;
|
||||
char *titles[3];
|
||||
|
||||
scrolled = gtk_scrolled_window_new (NULL, NULL);
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
|
||||
@ -543,13 +417,9 @@ mail_accounts_etable_new (char *widget_name, char *string1, char *string2, int i
|
||||
NULL);
|
||||
renderer = gtk_cell_renderer_text_new ();
|
||||
gtk_tree_view_insert_column_with_attributes ((GtkTreeView *) table, -1, _("Account name"),
|
||||
renderer,
|
||||
"text", 1,
|
||||
NULL);
|
||||
renderer, "text", 1, NULL);
|
||||
gtk_tree_view_insert_column_with_attributes ((GtkTreeView *)table, -1, _("Protocol"),
|
||||
renderer,
|
||||
"text", 2,
|
||||
NULL);
|
||||
renderer, "text", 2, NULL);
|
||||
selection = gtk_tree_view_get_selection ((GtkTreeView *) table);
|
||||
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
|
||||
gtk_tree_view_set_headers_visible ((GtkTreeView *) table, TRUE);
|
||||
@ -560,14 +430,13 @@ mail_accounts_etable_new (char *widget_name, char *string1, char *string2, int i
|
||||
|
||||
gtk_container_add (GTK_CONTAINER (scrolled), table);
|
||||
|
||||
g_object_set_data(G_OBJECT(scrolled), "table", table);
|
||||
g_object_set_data ((GObject *) scrolled, "table", table);
|
||||
|
||||
gtk_widget_show (scrolled);
|
||||
gtk_widget_show (table);
|
||||
|
||||
return scrolled;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
mail_accounts_tab_construct (MailAccountsTab *prefs)
|
||||
@ -589,24 +458,11 @@ mail_accounts_tab_construct (MailAccountsTab *prefs)
|
||||
|
||||
widget = glade_xml_get_widget (gui, "etableMailAccounts");
|
||||
|
||||
#if USE_ETABLE
|
||||
prefs->table = e_table_scrolled_get_table (E_TABLE_SCROLLED (widget));
|
||||
prefs->model = prefs->table->model;
|
||||
|
||||
g_signal_connect((prefs->table), "cursor_change",
|
||||
account_cursor_change, prefs);
|
||||
|
||||
g_signal_connect((prefs->table), "double_click",
|
||||
account_double_click, prefs);
|
||||
|
||||
mail_accounts_load (prefs);
|
||||
#else
|
||||
prefs->table = GTK_TREE_VIEW (g_object_get_data(G_OBJECT(widget), "table"));
|
||||
prefs->table = GTK_TREE_VIEW (g_object_get_data ((GObject *) widget, "table"));
|
||||
g_signal_connect (gtk_tree_view_get_selection (prefs->table),
|
||||
"changed", G_CALLBACK (account_cursor_change), prefs);
|
||||
|
||||
mail_accounts_load (prefs);
|
||||
#endif
|
||||
|
||||
prefs->mail_add = GTK_BUTTON (glade_xml_get_widget (gui, "cmdAccountAdd"));
|
||||
g_signal_connect (prefs->mail_add, "clicked", G_CALLBACK (account_add_clicked), prefs);
|
||||
|
||||
Reference in New Issue
Block a user