From 380576d30a614bf98bf1b108581cbca085aac772 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 27 Feb 2007 23:53:32 +0000 Subject: [PATCH] * small cleanups, refactor, remove debug spam pmo-trunk-r863 --- src/widgets/modest-account-view-window.h | 7 ++--- src/widgets/modest-folder-view.c | 7 ++--- src/widgets/modest-header-view-render.c | 44 ++++++++++++++---------------- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/src/widgets/modest-account-view-window.h b/src/widgets/modest-account-view-window.h index d118225..b9cee2c 100644 --- a/src/widgets/modest-account-view-window.h +++ b/src/widgets/modest-account-view-window.h @@ -4,7 +4,7 @@ #ifndef __MODEST_ACCOUNT_VIEW_WINDOW_H__ #define __MODEST_ACCOUNT_VIEW_WINDOW_H__ -#include +#include G_BEGIN_DECLS @@ -20,12 +20,12 @@ typedef struct _ModestAccountViewWindow ModestAccountViewWindow; typedef struct _ModestAccountViewWindowClass ModestAccountViewWindowClass; struct _ModestAccountViewWindow { - GtkWindow parent; + GtkDialog parent; /* insert public members, if any */ }; struct _ModestAccountViewWindowClass { - GtkWindowClass parent_class; + GtkDialogClass parent_class; /* insert signal callback declarations, eg. */ /* void (* my_event) (ModestAccountViewWindow* obj); */ }; @@ -41,7 +41,6 @@ GType modest_account_view_window_get_type (void) G_GNUC_CONST; - /** * modest_account_view_window_new: * @account_view: a #ModestAccountView diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 1dbc121..d034076 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -227,10 +227,9 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, fname = g_strdup(modest_local_folder_info_get_type_display_name (type)); } } - }/* else if (folder && type == TNY_FOLDER_TYPE_ROOT) { */ -/* g_warning ("fname: %s", fname); */ -/* /\* FIXME: todo *\/ */ -/* } */ + } else if (folder && type == TNY_FOLDER_TYPE_ROOT) { + /* FIXME: todo */ + } if (unread > 0) { gchar *folder_title = g_strdup_printf ("%s (%d)", fname, unread); diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c index 6e26192..2b2d6ad 100644 --- a/src/widgets/modest-header-view-render.c +++ b/src/widgets/modest-header-view-render.c @@ -97,6 +97,15 @@ get_pixbuf_for_flag (TnyHeaderFlags flag) } } +static void +set_common_flags (GtkCellRenderer *renderer, TnyHeaderFlags flags) +{ + g_object_set (G_OBJECT(renderer), + "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800, + "strikethrough", (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE, + NULL); +} + void _modest_header_view_msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, @@ -141,11 +150,7 @@ _modest_header_view_header_cell_data (GtkTreeViewColumn *column, GtkCellRender gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); - - g_object_set (G_OBJECT(renderer), - "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800, - "strikethrough", (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE, - NULL); + set_common_flags (renderer, flags); } @@ -171,10 +176,10 @@ _modest_header_view_date_cell_data (GtkTreeViewColumn *column, GtkCellRenderer display_date = modest_text_utils_get_display_date (date); g_object_set (G_OBJECT(renderer), - "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800, - "strikethrough", (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE, "text", display_date, NULL); + + set_common_flags (renderer, flags); g_free (display_date); } @@ -200,13 +205,9 @@ _modest_header_view_sender_receiver_cell_data (GtkTreeViewColumn *column, GtkC g_object_set (G_OBJECT(renderer), "text", modest_text_utils_get_display_address (address), - "weight", - (flags & TNY_HEADER_FLAG_SEEN) ? 400 : 800, - "striketrough", - (flags & TNY_HEADER_FLAG_DELETED)?TRUE:FALSE, NULL); - - g_free (address); + g_free (address); + set_common_flags (renderer, flags); } /* * this for both incoming and outgoing mail, depending on the the user_data @@ -250,11 +251,9 @@ _modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCe g_free (subject); g_free (display_date); - g_object_set (G_OBJECT(renderer), - "text", header, - "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800, - "strikethrough", (flags & TNY_HEADER_FLAG_DELETED) ? TRUE: FALSE, - NULL); + g_object_set (G_OBJECT(renderer), "text", header, NULL); + set_common_flags (renderer, flags); + g_free (header); } @@ -275,11 +274,8 @@ _modest_header_view_size_cell_data (GtkTreeViewColumn *column, GtkCellRenderer size_str = modest_text_utils_get_display_size (size); - g_object_set (G_OBJECT(renderer), - "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800, - "striketrough", (flags & TNY_HEADER_FLAG_DELETED) ? TRUE:FALSE, - "text", size_str, - NULL); - g_free (size_str); + g_object_set (G_OBJECT(renderer), "text", size_str, NULL); + set_common_flags (renderer, flags); + g_free (size_str); } -- 1.7.9.5