[anjal] Fix warnings
- From: Srinivasa Ragavan <sragavan src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjal] Fix warnings
- Date: Fri, 29 May 2009 08:00:43 -0400 (EDT)
commit ca51cace2cc986194658ca3d1a4ab05f7e18fbd4
Author: Srinivasa Ragavan <sragavan novell com>
Date: Fri May 29 10:54:54 2009 +0530
Fix warnings
---
src/custom-cell-renderer-toggle-pixbuf.h | 1 +
src/em-tree-store.h | 1 +
src/mail-folder-view.c | 372 ++++++++++++++----------------
3 files changed, 181 insertions(+), 193 deletions(-)
diff --git a/src/custom-cell-renderer-toggle-pixbuf.h b/src/custom-cell-renderer-toggle-pixbuf.h
index 210c79c..6a55d1a 100644
--- a/src/custom-cell-renderer-toggle-pixbuf.h
+++ b/src/custom-cell-renderer-toggle-pixbuf.h
@@ -55,6 +55,7 @@ struct _CustomCellRendererTogglePixbufClass
const gchar *path);
};
+GType custom_cell_renderer_toggle_pixbuf_get_type (void);
GtkCellRenderer *custom_cell_renderer_toggle_pixbuf_new (GdkPixbuf *active, GdkPixbuf *inactive);
diff --git a/src/em-tree-store.h b/src/em-tree-store.h
index 1d38e9b..4bbecd0 100644
--- a/src/em-tree-store.h
+++ b/src/em-tree-store.h
@@ -114,4 +114,5 @@ const char * em_tree_store_get_uid_from_iter (EMTreeStore *emts, GtkTreeIter *i
int em_tree_store_get_iter(EMTreeStore *emts, GtkTreeIter *iter, const char *uid);
const CamelMessageInfo * em_tree_store_get_info_from_iter (EMTreeStore *emts, GtkTreeIter *iter);
GPtrArray * em_tree_store_get_child_infos (EMTreeStore *emts, GtkTreeIter *iter);
+void em_tree_store_search_folder (EMTreeStore *emts, CamelFolder *folder, const char *expr, gboolean prune);
#endif /* _EM_TREE_STORE_H */
diff --git a/src/mail-folder-view.c b/src/mail-folder-view.c
index cd730ec..576c77d 100644
--- a/src/mail-folder-view.c
+++ b/src/mail-folder-view.c
@@ -146,18 +146,16 @@ struct _sort_data {
sort_func func;
int value;
} sorting[] = {
- { N_("_Date"), sort_dsent, 1 },
- { N_("_Subject"), sort_subject, 2 },
- { N_("_From"), sort_from, 3 },
+ { N_("_Date"), (sort_func)sort_dsent, 1 },
+ { N_("_Subject"), (sort_func)sort_subject, 2 },
+ { N_("_From"), (sort_func)sort_from, 3 },
};
static gboolean
mfv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailFolderView *mfv)
{
- GdkPixbuf *img = g_object_get_data (w, "pbuf");
+ GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf");
cairo_t *cr = gdk_cairo_create (w->window);
- int wid = w->allocation.width;
- int heig = w->allocation.height;
cairo_save (cr);
gdk_cairo_set_source_pixbuf (cr, img, event->area.x-4, event->area.y-5);
cairo_paint(cr);
@@ -180,7 +178,7 @@ mfv_save (MailFolderView *mfv)
if (uid && *uid)
camel_object_meta_set (mfv->priv->folder, "anjal:selected_uid", uid);
- pos = gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment (mfv->priv->view_scroller));
+ pos = gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment ((GtkScrolledWindow *)mfv->priv->view_scroller));
state = g_strdup_printf ("%lf", pos);
camel_object_meta_set (mfv->priv->folder, "anjal:scroll_position", state);
camel_object_state_write(mfv->priv->folder);
@@ -203,18 +201,18 @@ mail_folder_view_init (MailFolderView *shell)
shell->type = MAIL_VIEW_FOLDER;
img = gtk_image_new_from_pixbuf (pbuf);
- g_object_set_data (img, "pbuf", pbuf);
- g_signal_connect (img, "expose-event", mfv_btn_expose, shell);
+ g_object_set_data ((GObject *)img, "pbuf", pbuf);
+ g_signal_connect (img, "expose-event", G_CALLBACK(mfv_btn_expose), shell);
shell->uri = g_strdup("folder://");
tool = gtk_button_new ();
- gtk_button_set_relief(tool, GTK_RELIEF_NONE);
- gtk_button_set_focus_on_click (tool, FALSE);
+ gtk_button_set_relief((GtkButton *)tool, GTK_RELIEF_NONE);
+ gtk_button_set_focus_on_click ((GtkButton *)tool, FALSE);
gtk_widget_set_tooltip_text (tool, _("Close Tab"));
g_signal_connect (tool, "clicked", G_CALLBACK(mfv_close), shell);
box = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (box, img, FALSE, FALSE, 0);
- gtk_container_add (tool, box);
+ gtk_box_pack_start ((GtkBox *)box, img, FALSE, FALSE, 0);
+ gtk_container_add ((GtkContainer *)tool, box);
gtk_widget_show_all (tool);
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings(tool) , GTK_ICON_SIZE_MENU, &w, &h);
gtk_widget_set_size_request (tool, w+2, h+2);
@@ -228,16 +226,16 @@ mail_folder_view_init (MailFolderView *shell)
if (shell->priv->light)
shell->model = mail_sqlite_store_new ();
else {
- shell->model = em_tree_store_new (shell->priv->show_children);
- ((EMTreeStore *)shell->model)->func = sort_dsent;
+ shell->model = (GtkTreeModel *)em_tree_store_new (shell->priv->show_children);
+ ((EMTreeStore *)shell->model)->func = (sort_func)sort_dsent;
((EMTreeStore *)shell->model)->sort_ascending = FALSE;
}
shell->priv->expr = g_strdup ("(match-all (not (system-flag \"junk\")))");
shell->tab_label = gtk_hbox_new (FALSE, 0);
shell->menu_label = gtk_label_new (NULL);
shell->priv->tab_str = gtk_label_new (_("Select Folder"));
- gtk_box_pack_start (shell->tab_label, shell->priv->tab_str, FALSE, FALSE, 0);
- gtk_box_pack_start (shell->tab_label, tool, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)shell->tab_label, shell->priv->tab_str, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)shell->tab_label, tool, FALSE, FALSE, 0);
gtk_widget_show_all (shell->tab_label);
g_object_unref (pbuf);
shell->priv->uid = NULL;
@@ -275,7 +273,7 @@ struct _db_read_msg {
const char *uri;
gboolean load;
- void (*done) (char *uri, CamelFolder *folder, void *data);
+ void (*done) (MailFolderView *, CamelFolder *folder, const char *uri);
};
static void
@@ -289,19 +287,19 @@ db_read_exec (struct _db_read_msg *m)
/* Load cursor based or folder based */
if (mfv->priv->light)
- mail_sqlite_store_set_folder (mfv->model, folder, NULL);
+ mail_sqlite_store_set_folder ((MailSqliteStore *)mfv->model, folder, NULL);
else {
char *str;
if (!mfv->priv->search && m->load)
- em_tree_store_add_folder (mfv->model, folder, mfv->priv->expr, TRUE);
+ em_tree_store_add_folder ((EMTreeStore *)mfv->model, folder, mfv->priv->expr, TRUE);
else {
str = g_strdup_printf("(and %s %s)", mfv->priv->expr, mfv->priv->search);
if (m->load)
- em_tree_store_add_folder (mfv->model, folder, str, TRUE);
+ em_tree_store_add_folder ((EMTreeStore *)mfv->model, folder, str, TRUE);
else
- em_tree_store_search_folder (mfv->model, folder, mfv->priv->search ? str : mfv->priv->expr, TRUE);
+ em_tree_store_search_folder ((EMTreeStore *)mfv->model, folder, mfv->priv->search ? str : mfv->priv->expr, TRUE);
g_free(str);
}
@@ -322,7 +320,7 @@ db_read_done (struct _db_read_msg *m)
static void
db_read_free (struct _db_read_msg *m)
{
- g_free(m->uri);
+ g_free((char *)m->uri);
}
static MailMsgInfo db_read_info = {
@@ -351,7 +349,6 @@ static void
mfv_got_folder(char *uri, CamelFolder *folder, void *data)
{
MailFolderView *mfv = data;
- struct _db_read_msg *m;
if (mfv->priv->folder) {
mfv_save(mfv);
@@ -362,7 +359,7 @@ mfv_got_folder(char *uri, CamelFolder *folder, void *data)
if (mfv->priv->light)
mfv->model = mail_sqlite_store_new ();
else {
- mfv->model = em_tree_store_new (mfv->priv->show_children);
+ mfv->model = (GtkTreeModel *)em_tree_store_new (mfv->priv->show_children);
((EMTreeStore *)mfv->model)->func = sorting[mfv->priv->sort_selected-1].func;;
((EMTreeStore *)mfv->model)->sort_ascending = mfv->priv->sort_ascending;
}
@@ -384,13 +381,13 @@ mail_folder_view_set_folder_uri (MailFolderView *mfv, const char *uri)
g_free(mfv->uri);
mfv->uri = g_strdup(uri);
gtk_widget_show (mfv->priv->info_spinner);
- gtk_widget_hide (mfv->mail);
- gtk_widget_show (mfv->priv->info_bar);
+ gtk_widget_hide ((GtkWidget *)mfv->mail);
+ gtk_widget_show ((GtkWidget *)mfv->priv->info_bar);
gtk_widget_hide (mfv->priv->view_scroller);
if (uri) {
str = g_strdup_printf("%s %s", _("Loading folder"), uri);
- gtk_label_set_text (g_object_get_data(mfv->priv->info_bar, "label"), str);
+ gtk_label_set_text (g_object_get_data((GObject *)mfv->priv->info_bar, "label"), str);
g_free(str);
mail_get_folder(uri, 0, mfv_got_folder, mfv, mail_msg_fast_ordered_push);
}
@@ -407,7 +404,7 @@ mail_folder_view_set_folder (MailFolderView *mfv, CamelFolder *folder, const cha
if (mfv->priv->light)
mfv->model = mail_sqlite_store_new ();
else {
- mfv->model = em_tree_store_new (mfv->priv->show_children);
+ mfv->model = (GtkTreeModel *)em_tree_store_new (mfv->priv->show_children);
((EMTreeStore *)mfv->model)->func = sorting[mfv->priv->sort_selected-1].func;;
((EMTreeStore *)mfv->model)->sort_ascending = mfv->priv->sort_ascending;
}
@@ -419,22 +416,22 @@ mail_folder_view_set_folder (MailFolderView *mfv, CamelFolder *folder, const cha
GtkTreeIter iter;
gtk_tree_view_set_model (GTK_TREE_VIEW (mfv->tree), mfv->model);
mfv->priv->folder = folder;
- gtk_widget_hide (mfv->mail);
+ gtk_widget_hide ((GtkWidget *)mfv->mail);
gtk_widget_hide (mfv->priv->info_spinner);
gtk_widget_hide (mfv->priv->info_bar);
gtk_widget_show (mfv->priv->view_scroller);
- gtk_widget_show (mfv->tree);
+ gtk_widget_show ((GtkWidget *)mfv->tree);
last_sel_uid = camel_object_meta_get (folder, "anjal:selected_uid");
spos = camel_object_meta_get (folder, "anjal:scroll_position");
if (spos && *spos) {
pos = strtod(spos, NULL);
}
- gtk_label_set_text (mfv->priv->tab_str, folder->full_name);
- gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment (mfv->priv->view_scroller), pos);
+ gtk_label_set_text ((GtkLabel *)mfv->priv->tab_str, folder->full_name);
+ gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment ((GtkScrolledWindow *)mfv->priv->view_scroller), pos);
if (last_sel_uid && *last_sel_uid) {
GtkTreeSelection *sel = gtk_tree_view_get_selection (mfv->tree);
GtkTreePath *path;
- if (em_tree_store_get_iter (mfv->model, &iter, last_sel_uid)) {
+ if (em_tree_store_get_iter ((EMTreeStore *)mfv->model, &iter, last_sel_uid)) {
gtk_tree_selection_select_iter (sel, &iter);
path = gtk_tree_model_get_path (mfv->model, &iter);
@@ -443,7 +440,7 @@ mail_folder_view_set_folder (MailFolderView *mfv, CamelFolder *folder, const cha
gtk_tree_path_free (path);
}
}
- gtk_widget_grab_focus (mfv->tree);
+ gtk_widget_grab_focus ((GtkWidget *)mfv->tree);
/* FIXME: Set a signal emit and listen for it at note book and set the title appropriately */
}
@@ -559,7 +556,7 @@ draw_img (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *t
while (tmp) {
GtkCellRenderer *child = (GtkCellRenderer *)tmp->data;
- char *data = g_object_get_data (child, "data");
+ char *data = g_object_get_data ((GObject *)child, "data");
GdkPixbuf *img;
if (!GTK_IS_CELL_RENDERER_PIXBUF(child)) {
@@ -568,9 +565,9 @@ draw_img (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *t
}
if (data) {
img = e_icon_factory_get_icon (data, E_ICON_SIZE_MENU);
- g_object_set (child, "pixbuf", img, NULL);
+ g_object_set ((GObject *)child, "pixbuf", img, NULL);
} else {
- g_object_set (child, "pixbuf", gdk_pixbuf_new_from_xpm_data ((const char **) empty_xpm), NULL);
+ g_object_set ((GObject *)child, "pixbuf", gdk_pixbuf_new_from_xpm_data ((const char **) empty_xpm), NULL);
}
tmp = tmp->next;
}
@@ -578,12 +575,11 @@ draw_img (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *t
static void
draw_text (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, MailFolderView *mfv)
{
- char *text;
CustomCellRendererVBox *cellprogress = CUSTOM_CELL_RENDERER_VBOX (cell);
GValue value = { 0, }, value1 = {0,};
int i=0;
gboolean bold, ellipsize, strike, markup;
- gboolean unread;
+ gboolean unread = FALSE;
guint32 flags;
GtkTreeIter sel_iter;
GtkTreeSelection *sel = gtk_tree_view_get_selection (mfv->tree);
@@ -609,11 +605,11 @@ draw_text (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *
}
if (GTK_IS_CELL_RENDERER_TEXT (child) || CUSTOM_IS_CELL_RENDERER_HBOX(child)) {
- i = GPOINTER_TO_INT(g_object_get_data(child, "data"));
- ellipsize = GPOINTER_TO_INT(g_object_get_data(child, "p-ellipsize")) ? TRUE : FALSE;
- bold = GPOINTER_TO_INT(g_object_get_data(child, "p-bold")) ? TRUE : FALSE;
- strike = GPOINTER_TO_INT(g_object_get_data(child, "p-strike")) ? TRUE : FALSE;
- markup = GPOINTER_TO_INT(g_object_get_data(child, "p-markup")) ? TRUE : FALSE;
+ i = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "data"));
+ ellipsize = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "p-ellipsize")) ? TRUE : FALSE;
+ bold = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "p-bold")) ? TRUE : FALSE;
+ strike = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "p-strike")) ? TRUE : FALSE;
+ markup = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "p-markup")) ? TRUE : FALSE;
if (i !=-1) {
GValue v = {0,}, v1 = {0};
g_value_init (&v, G_TYPE_UINT);
@@ -621,10 +617,10 @@ draw_text (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *
g_value_init (&v1, G_TYPE_BOOLEAN);
g_value_unset (&v1);
if (i == EMTS_COL_THREADPREVIEW) /* Hack to set the selected color a bit different */
- g_object_set_data (tree_model, "sel", GINT_TO_POINTER(selected));
+ g_object_set_data ((GObject *)tree_model, "sel", GINT_TO_POINTER(selected));
gtk_tree_model_get_value (tree_model, iter, i, &value);
if (i == EMTS_COL_THREADPREVIEW)
- g_object_set_data (tree_model, "sel", GINT_TO_POINTER(0));
+ g_object_set_data ((GObject *)tree_model, "sel", GINT_TO_POINTER(0));
g_object_set_property ((GObject *)child, (gchar *) markup ? "markup" : "text", &value);
if (mfv->priv->light) {
@@ -658,11 +654,11 @@ draw_text (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *
g_value_unset (&v);
g_value_init (&v1, G_TYPE_BOOLEAN);
g_value_unset (&v1);
- i = GPOINTER_TO_INT(g_object_get_data(c, "data"));
- ellipsize = GPOINTER_TO_INT(g_object_get_data(c, "p-ellipsize")) ? TRUE : FALSE;
- bold = GPOINTER_TO_INT(g_object_get_data(c, "p-bold")) ? TRUE : FALSE;
- strike = GPOINTER_TO_INT(g_object_get_data(c, "p-strike")) ? TRUE : FALSE;
- markup = GPOINTER_TO_INT(g_object_get_data(c, "p-markup")) ? TRUE : FALSE;
+ i = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "data"));
+ ellipsize = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "p-ellipsize")) ? TRUE : FALSE;
+ bold = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "p-bold")) ? TRUE : FALSE;
+ strike = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "p-strike")) ? TRUE : FALSE;
+ markup = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "p-markup")) ? TRUE : FALSE;
gtk_tree_model_get_value (tree_model, iter, i, &value);
if (!mfv->priv->light && i == EMTS_COL_DATE) {
char *str = filter_date (g_value_get_uint(&value));
@@ -702,11 +698,11 @@ draw_text (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *
if (mfv->priv->light) {
gtk_tree_model_get_value (tree_model, iter, COL_FLAGS, &v);
flags = g_value_get_uint (&v);
- gtk_cell_renderer_toggle_set_active (c, (flags & CAMEL_MESSAGE_SEEN) != 0);
+ gtk_cell_renderer_toggle_set_active ((GtkCellRendererToggle *)c, (flags & CAMEL_MESSAGE_SEEN) != 0);
} else {
gtk_tree_model_get_value (tree_model, iter, EMTS_COL_UNREAD, &v1);
unread = g_value_get_boolean (&v1);
- gtk_cell_renderer_toggle_set_active (c, unread);
+ gtk_cell_renderer_toggle_set_active ((GtkCellRendererToggle *)c, unread);
}
}
@@ -722,11 +718,11 @@ draw_text (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *
g_value_init (&v1, G_TYPE_BOOLEAN);
g_value_unset (&v1);
- i = GPOINTER_TO_INT(g_object_get_data(c, "data"));
- ellipsize = GPOINTER_TO_INT(g_object_get_data(c, "p-ellipsize")) ? TRUE : FALSE;
- bold = GPOINTER_TO_INT(g_object_get_data(c, "p-bold")) ? TRUE : FALSE;
- strike = GPOINTER_TO_INT(g_object_get_data(c, "p-strike")) ? TRUE : FALSE;
- markup = GPOINTER_TO_INT(g_object_get_data(c, "p-markup")) ? TRUE : FALSE;
+ i = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "data"));
+ ellipsize = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "p-ellipsize")) ? TRUE : FALSE;
+ bold = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "p-bold")) ? TRUE : FALSE;
+ strike = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "p-strike")) ? TRUE : FALSE;
+ markup = GPOINTER_TO_INT(g_object_get_data((GObject *)c, "p-markup")) ? TRUE : FALSE;
if (!mfv->priv->light && i == EMTS_COL_DATE) {
char *str =NULL;
@@ -783,23 +779,21 @@ draw_text (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *
static void
draw_flags (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, MailFolderView *mfv)
{
- char *text;
CustomCellRendererVBox *cellprogress = CUSTOM_CELL_RENDERER_VBOX (cell);
int i=0;
gboolean bold, ellipsize, strike, markup;
- gboolean unread;
- guint32 flags;
+ gboolean unread = FALSE;
GList *tmp = cellprogress->children;
while (tmp) {
GtkCellRenderer *child = (GtkCellRenderer *)tmp->data;
if (CUSTOM_IS_CELL_RENDERER_TOGGLE_PIXBUF (child)) {
- i = GPOINTER_TO_INT(g_object_get_data(child, "data"));
- ellipsize = GPOINTER_TO_INT(g_object_get_data(child, "p-ellipsize")) ? TRUE : FALSE;
- bold = GPOINTER_TO_INT(g_object_get_data(child, "p-bold")) ? TRUE : FALSE;
- strike = GPOINTER_TO_INT(g_object_get_data(child, "p-strike")) ? TRUE : FALSE;
- markup = GPOINTER_TO_INT(g_object_get_data(child, "p-markup")) ? TRUE : FALSE;
+ i = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "data"));
+ ellipsize = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "p-ellipsize")) ? TRUE : FALSE;
+ bold = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "p-bold")) ? TRUE : FALSE;
+ strike = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "p-strike")) ? TRUE : FALSE;
+ markup = GPOINTER_TO_INT(g_object_get_data((GObject *)child, "p-markup")) ? TRUE : FALSE;
if (i !=-1) {
GValue v1 = {0};
g_value_init (&v1, G_TYPE_BOOLEAN);
@@ -814,7 +808,7 @@ draw_flags (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel
if(!mfv->priv->light)
unread = g_value_get_boolean (&v1);
- g_object_set (child, "active", unread, NULL);
+ g_object_set ((GObject *)child, "active", unread, NULL);
}
}
@@ -825,10 +819,10 @@ draw_flags (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel
void
mail_folder_view_show_list (MailFolderView *mfv)
{
- gtk_widget_show (mfv->tree);
+ gtk_widget_show ((GtkWidget *)mfv->tree);
gtk_widget_show (mfv->priv->view_scroller);
- gtk_widget_hide (mfv->mail);
- gtk_widget_grab_focus (mfv->tree);
+ gtk_widget_hide ((GtkWidget *)mfv->mail);
+ gtk_widget_grab_focus ((GtkWidget *)mfv->tree);
}
@@ -843,7 +837,7 @@ mfv_get_selected_uid (GtkTreeView *tree, MailFolderView *mfv)
if(!selected)
return NULL;
- return em_tree_store_get_uid_from_iter (mfv->model, &iter);
+ return em_tree_store_get_uid_from_iter ((EMTreeStore *)mfv->model, &iter);
}
static const CamelMessageInfo *
@@ -857,7 +851,7 @@ mfv_get_selected_info (GtkTreeView *tree, MailFolderView *mfv)
if(!selected)
return NULL;
- return em_tree_store_get_info_from_iter(mfv->model, &iter);
+ return em_tree_store_get_info_from_iter((EMTreeStore *)mfv->model, &iter);
}
static GPtrArray *
@@ -873,10 +867,10 @@ mfv_get_selected_threads (MailFolderView *mfv)
while (tmp) {
GtkTreePath *path = (GtkTreePath *)tmp->data;
gtk_tree_model_get_iter (mfv->model, &iter, path);
- g_ptr_array_add (uids, g_strdup(em_tree_store_get_uid_from_iter (mfv->model, &iter)));
+ g_ptr_array_add (uids, g_strdup(em_tree_store_get_uid_from_iter ((EMTreeStore *)mfv->model, &iter)));
tmp = tmp->next;
}
- g_list_foreach (slist, gtk_tree_path_free, NULL);
+ g_list_foreach (slist, (GFunc)gtk_tree_path_free, NULL);
g_list_free (slist);
return uids;
@@ -893,12 +887,12 @@ mfv_popup_open_new_tab (EPopup *ep, EPopupItem *pitem, void *data)
char *umid;
gtk_tree_selection_get_selected (sel, NULL, &iter);
- uids = em_tree_store_get_child_sorted_tree (mfv->model, &iter);
+ uids = em_tree_store_get_child_sorted_tree ((EMTreeStore *)mfv->model, &iter);
if (!uids || uids->len <= 0)
return;
- umid = g_strdup_printf("message://%s/%s", mfv->priv->folder->full_name, uids->pdata[0]);
+ umid = g_strdup_printf("message://%s/%s", mfv->priv->folder->full_name, (char *)uids->pdata[0]);
g_signal_emit (mfv, signals[MESSAGE_NEW], 0, &mcv, umid);
if (!mcv)
@@ -992,7 +986,7 @@ mfv_popup_items_free(EPopup *ep, GSList *items, void *data)
static void
mfv_popup (MailFolderView *mfv, GdkEvent *event)
{
- GSList *menus = NULL, *l, *label_list = NULL;
+ GSList *menus = NULL;
GtkMenu *menu;
EMPopup *emp;
EMPopupTargetSelect *t;
@@ -1039,9 +1033,9 @@ mfv_button_clicked (GtkWidget *w, GdkEventButton *event, MailFolderView *mfv)
if (gtk_tree_model_get_iter (mfv->model, &iter, path)) {
char *umid = NULL;
- uids = em_tree_store_get_child_sorted_tree (mfv->model, &iter);
+ uids = em_tree_store_get_child_sorted_tree ((EMTreeStore *)mfv->model, &iter);
if (uids && uids->len >0) {
- umid = g_strdup_printf("message://%s/%s\n", mfv->priv->folder->full_name, uids->pdata[0]);
+ umid = g_strdup_printf("message://%s/%s\n", mfv->priv->folder->full_name, (char *)uids->pdata[0]);
g_signal_emit (mfv, signals[MESSAGE_NEW], 0, &mcv, umid);
g_free(umid);
@@ -1055,7 +1049,7 @@ mfv_button_clicked (GtkWidget *w, GdkEventButton *event, MailFolderView *mfv)
return TRUE;
} else if (event->button == 3) {
/* Right click */
- mfv_popup (mfv, event);
+ mfv_popup (mfv, (GdkEvent *)event);
return TRUE;
}
return FALSE;
@@ -1065,19 +1059,11 @@ static void
mfv_message_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, MailFolderView *shell)
{
GtkTreeIter iter;
- GtkWidget *expander;
CamelMessageInfo *info = NULL;
- CamelMimeMessage *msg;
- GtkWidget *label;
- CamelException *ex;
- const char *subject;
- char *markup;
- const char *from_addr;
- GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
-
- gtk_widget_hide (shell->tree);
+
+ gtk_widget_hide ((GtkWidget *)shell->tree);
gtk_widget_hide (shell->priv->view_scroller);
- gtk_widget_show (shell->mail);
+ gtk_widget_show ((GtkWidget *)shell->mail);
if (!gtk_tree_model_get_iter (shell->model, &iter, path)) {
g_warning ("Unable to open message\n");
@@ -1090,7 +1076,7 @@ mfv_message_activated (GtkTreeView *tree_view, GtkTreePath *path, G
/* Implement plain message view */
} else {
/* Threaded message view */
- GPtrArray *msgs = em_tree_store_get_child_sorted_tree (shell->model, &iter);
+ GPtrArray *msgs = em_tree_store_get_child_sorted_tree ((EMTreeStore *)shell->model, &iter);
/* FIXME: Handle 'Sent' messages */
mail_conv_view_set_thread (shell->mail, shell->priv->folder, msgs);
@@ -1101,7 +1087,7 @@ mfv_message_activated (GtkTreeView *tree_view, GtkTreePath *path, G
static void
mfv_tree_resize (GtkWidget *w, GtkAllocation *req, GtkTreeViewColumn *col)
{
- MailFolderView *shell = g_object_get_data(w, "shell");
+ MailFolderView *shell = g_object_get_data((GObject *)w, "shell");
if ((req->width - (gtk_tree_view_column_get_fixed_width(col)+66) > 10) && GTK_WIDGET_VISIBLE(shell->priv->folder_pane)) {
gtk_tree_view_column_set_fixed_width (col, req->width - 66);
}
@@ -1123,7 +1109,7 @@ mfv_selection_mark (MailFolderView *mfv, guint32 mask, guint32 set)
return;
camel_message_info_set_flags (info, mask, set);
- msgs = em_tree_store_get_child_infos (mfv, &iter);
+ msgs = em_tree_store_get_child_infos ((EMTreeStore *)mfv->model, &iter);
for (i=0; i<msgs->len; i++)
camel_message_info_set_flags ((CamelMessageInfo *)msgs->pdata[i], mask, set);
}
@@ -1154,19 +1140,20 @@ mfv_read (MailFolderView *mfv, gboolean read)
else
mfv_selection_mark (mfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, 0);
}
-
+#ifdef NOT_USED
static CamelMessageInfo *
mfv_get_info (GObject *obj, char *path)
{
- GtkTreeIter iter;
- MailFolderView *mfv = g_object_get_data(obj, "mfv");
- return em_tree_store_get_info_from_path_string (mfv->model, path);
+ MailFolderView *mfv = g_object_get_data((GObject *)obj, "mfv");
+ return em_tree_store_get_info_from_path_string ((EMTreeStore *)mfv->model, path);
}
+#endif
+
static gboolean
mfv_msg_delete (GtkCellRenderer *cell, GdkEvent *event,GtkWidget *widget,const gchar *path,const GdkRectangle *background_area,const GdkRectangle *cell_area,GtkCellRendererState flags)
{
- MailFolderView *mfv = g_object_get_data(cell, "mfv");
+ MailFolderView *mfv = g_object_get_data((GObject *)cell, "mfv");
mfv_selection_mark (mfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED );
return TRUE;
@@ -1175,7 +1162,7 @@ mfv_msg_delete (GtkCellRenderer *cell, GdkEvent *event,GtkWidget *widget,const
static gboolean
mfv_msg_unread (GtkCellRenderer *cell, GdkEvent *event,GtkWidget *widget,const gchar *path,const GdkRectangle *background_area,const GdkRectangle *cell_area,GtkCellRendererState flags)
{
- MailFolderView *mfv = g_object_get_data(cell, "mfv");
+ MailFolderView *mfv = g_object_get_data((GObject *)cell, "mfv");
CustomCellRendererTogglePixbuf *toggle = (CustomCellRendererTogglePixbuf *)cell;
gboolean active = toggle->active;
@@ -1195,8 +1182,7 @@ mfv_msg_unread (GtkCellRenderer *cell, GdkEvent *event,GtkWidget *widget,const
static gboolean
mfv_msg_junk (GtkCellRenderer *cell, GdkEvent *event,GtkWidget *widget,const gchar *path,const GdkRectangle *background_area,const GdkRectangle *cell_area,GtkCellRendererState flags)
{
- CamelMessageInfo *info = mfv_get_info (cell, path);
- MailFolderView *mfv = g_object_get_data(cell, "mfv");
+ MailFolderView *mfv = g_object_get_data((GObject *)cell, "mfv");
mfv_selection_mark (mfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_JUNK_LEARN);
// camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_JUNK_LEARN);
@@ -1236,7 +1222,7 @@ void
mail_folder_view_construct (MailFolderView *shell)
{
MailFolderViewPrivate *priv = shell->priv;
- GtkWidget *viewbox, *infobox, *infolabel, *align;
+ GtkWidget *viewbox, *infolabel, *align;
GtkTreeViewColumn *column;
GtkCellRenderer *cell;
GtkCellRenderer *hbox, *vbox;
@@ -1251,12 +1237,12 @@ mail_folder_view_construct (MailFolderView *shell)
priv->info_bar = gtk_hbox_new (FALSE, 3);
priv->info_spinner = e_spinner_new_spinning_small_shown ();
gtk_widget_hide (priv->info_spinner);
- g_object_set_data (priv->info_bar, "label", infolabel);
- gtk_box_pack_start (priv->info_bar, align, FALSE, FALSE, 100);
- gtk_box_pack_start (priv->info_bar, priv->info_spinner, FALSE, FALSE, 0);
- gtk_box_pack_start (priv->info_bar, infolabel, FALSE, FALSE, 0);
+ g_object_set_data ((GObject *)priv->info_bar, "label", infolabel);
+ gtk_box_pack_start ((GtkBox *)priv->info_bar, align, FALSE, FALSE, 100);
+ gtk_box_pack_start ((GtkBox *)priv->info_bar, priv->info_spinner, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)priv->info_bar, infolabel, FALSE, FALSE, 0);
gtk_widget_show (priv->info_bar);
- gtk_box_pack_start (viewbox, priv->info_bar, TRUE, TRUE, 0);
+ gtk_box_pack_start ((GtkBox *)viewbox, priv->info_bar, TRUE, TRUE, 0);
priv->view_scroller = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->view_scroller),
GTK_SHADOW_IN);
@@ -1264,18 +1250,18 @@ mail_folder_view_construct (MailFolderView *shell)
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (shell, viewbox, TRUE, TRUE, 0);
- gtk_widget_show (shell);
+ gtk_box_pack_start ((GtkBox *)shell, viewbox, TRUE, TRUE, 0);
+ gtk_widget_show ((GtkWidget *)shell);
shell->tree = (GtkTreeView *)gtk_tree_view_new ();
sel = gtk_tree_view_get_selection (shell->tree);
// gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE);
gtk_tree_view_set_enable_search (shell->tree, FALSE);
- gtk_container_add (priv->view_scroller, shell->tree);
+ gtk_container_add ((GtkContainer *)priv->view_scroller, (GtkWidget *)shell->tree);
gtk_tree_view_set_fixed_height_mode (shell->tree, TRUE);
gtk_tree_view_set_rules_hint (shell->tree, TRUE);
- gtk_box_pack_start (viewbox, priv->view_scroller, TRUE, TRUE, 0);
- gtk_widget_show (shell->tree);
+ gtk_box_pack_start ((GtkBox *)viewbox, priv->view_scroller, TRUE, TRUE, 0);
+ gtk_widget_show ((GtkWidget *)shell->tree);
gtk_tree_view_set_headers_visible (shell->tree, FALSE);
gtk_tree_view_set_show_expanders (shell->tree, shell->priv->show_thread);
@@ -1292,10 +1278,10 @@ mail_folder_view_construct (MailFolderView *shell)
gtk_tree_view_column_set_resizable (column, TRUE);
vbox = custom_cell_renderer_vbox_new ();
- g_object_set_data (vbox, "mfv", shell);
- g_object_set (vbox, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
+ g_object_set_data ((GObject *)vbox, "mfv", shell);
+ g_object_set ((GObject *)vbox, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
gtk_tree_view_column_pack_start (column, vbox, TRUE);
- gtk_tree_view_column_set_cell_data_func (column, vbox, draw_flags, shell, NULL);
+ gtk_tree_view_column_set_cell_data_func (column, vbox, (GtkTreeCellDataFunc)draw_flags, shell, NULL);
/* dummy renderers for nice packing */
cell = custom_cell_renderer_toggle_pixbuf_new (gdk_pixbuf_new_from_xpm_data ((const char **) empty_xpm), gdk_pixbuf_new_from_xpm_data ((const char **) empty_xpm));
@@ -1303,12 +1289,12 @@ mail_folder_view_construct (MailFolderView *shell)
/* Pack a renderer for unread indication */
cell = custom_cell_renderer_toggle_pixbuf_new (gdk_pixbuf_new_from_file(unread_image, NULL), gdk_pixbuf_new_from_file(unread_image, NULL));
- g_object_set_data (cell, "mfv", shell);
- g_object_set_data (cell, "activate_func", mfv_msg_unread);
+ g_object_set_data ((GObject *)cell, "mfv", shell);
+ g_object_set_data ((GObject *)cell, "activate_func", mfv_msg_unread);
if (shell->priv->light)
- g_object_set_data (cell, "data", GINT_TO_POINTER (COL_FLAGS));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (COL_FLAGS));
else
- g_object_set_data (cell, "data", GINT_TO_POINTER (EMTS_COL_UNREAD));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (EMTS_COL_UNREAD));
custom_cell_renderer_vbox_append (vbox, cell);
/* dummy renderers for nice packing */
@@ -1329,29 +1315,29 @@ mail_folder_view_construct (MailFolderView *shell)
gtk_tree_view_append_column (GTK_TREE_VIEW (shell->tree), column);
gtk_tree_view_column_set_resizable (column, TRUE);
- g_object_set_data(shell->tree, "shell", shell);
- g_signal_connect (shell->tree, "size-allocate", mfv_tree_resize, column);
+ g_object_set_data((GObject *)shell->tree, "shell", shell);
+ g_signal_connect (shell->tree, "size-allocate", G_CALLBACK(mfv_tree_resize), column);
/* Main VBOX renderer, that shows multi line. */
vbox = custom_cell_renderer_vbox_new ();
gtk_tree_view_column_pack_start (column, vbox, TRUE);
- gtk_tree_view_column_set_cell_data_func (column, vbox, draw_text, shell, NULL);
+ gtk_tree_view_column_set_cell_data_func (column, vbox, (GtkTreeCellDataFunc)draw_text, shell, NULL);
/* Create the hbox renderer for the first line to be shown.*/
hbox = custom_cell_renderer_hbox_new ();
- g_object_set_data (hbox, "data", GINT_TO_POINTER (-1));
+ g_object_set_data ((GObject *)hbox, "data", GINT_TO_POINTER (-1));
custom_cell_renderer_vbox_append (vbox, hbox);
/* Create a renderer for FROM to be shown, */
cell = gtk_cell_renderer_text_new ();
if (shell->priv->light)
- g_object_set_data (cell, "data", GINT_TO_POINTER (COL_FROM));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (COL_FROM));
else
- g_object_set_data (cell, "data", GINT_TO_POINTER (EMTS_COL_FROM));
- g_object_set_data (cell, "p-ellipsize", GINT_TO_POINTER (1));
- g_object_set_data (cell, "p-markup", GINT_TO_POINTER (1));
- g_object_set_data (cell, "p-bold", GINT_TO_POINTER (0));
- g_object_set_data (cell, "p-strike", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (EMTS_COL_FROM));
+ g_object_set_data ((GObject *)cell, "p-ellipsize", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-markup", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-bold", GINT_TO_POINTER (0));
+ g_object_set_data ((GObject *)cell, "p-strike", GINT_TO_POINTER (1));
/* Pack From at the start of the cell */
custom_cell_renderer_hbox_pack_start (hbox, cell, FALSE);
@@ -1360,9 +1346,9 @@ mail_folder_view_construct (MailFolderView *shell)
/* Pack a renderer for unread indication */
cell = gtk_cell_renderer_toggle_new ();
if (shell->priv->light)
- g_object_set_data (cell, "data", GINT_TO_POINTER (COL_FLAGS));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (COL_FLAGS));
else
- g_object_set_data (cell, "data", GINT_TO_POINTER (EMTS_COL_UNREAD));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (EMTS_COL_UNREAD));
/* Pack toggle at the start of the cell */
custom_cell_renderer_hbox_pack_start (hbox, cell, FALSE);
#endif
@@ -1370,12 +1356,12 @@ mail_folder_view_construct (MailFolderView *shell)
/* Show a box for number of mails */
if (!shell->priv->light) {
cell = gtk_cell_renderer_text_new ();
- g_object_set_data (cell, "data", GINT_TO_POINTER (EMTS_COL_THREADCOUNT));
- g_object_set_data (cell, "p-markup", GINT_TO_POINTER (1));
- g_object_set_data (cell, "p-ellipsize", GINT_TO_POINTER (0));
- g_object_set_data (cell, "p-bold", GINT_TO_POINTER (0));
- g_object_set_data (cell, "p-strike", GINT_TO_POINTER (0));
- g_object_set_data (cell, "p-custom", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (EMTS_COL_THREADCOUNT));
+ g_object_set_data ((GObject *)cell, "p-markup", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-ellipsize", GINT_TO_POINTER (0));
+ g_object_set_data ((GObject *)cell, "p-bold", GINT_TO_POINTER (0));
+ g_object_set_data ((GObject *)cell, "p-strike", GINT_TO_POINTER (0));
+ g_object_set_data ((GObject *)cell, "p-custom", GINT_TO_POINTER (1));
/* Pack Date at the end of the cell */
custom_cell_renderer_hbox_pack_end (hbox, cell, FALSE);
}
@@ -1383,14 +1369,14 @@ mail_folder_view_construct (MailFolderView *shell)
/* Create a renderer for Date to be shown */
cell = gtk_cell_renderer_text_new ();
if (shell->priv->light)
- g_object_set_data (cell, "data", GINT_TO_POINTER (COL_DATE));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (COL_DATE));
else {
- g_object_set_data (cell, "data", GINT_TO_POINTER (EMTS_COL_DATE));
- g_object_set_data (cell, "conv-func", filter_date);
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (EMTS_COL_DATE));
+ g_object_set_data ((GObject *)cell, "conv-func", filter_date);
}
- g_object_set_data (cell, "p-ellipsize", GINT_TO_POINTER (0));
- g_object_set_data (cell, "p-bold", GINT_TO_POINTER (1));
- g_object_set_data (cell, "p-strike", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-ellipsize", GINT_TO_POINTER (0));
+ g_object_set_data ((GObject *)cell, "p-bold", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-strike", GINT_TO_POINTER (1));
/* Pack Date at the end of the cell */
custom_cell_renderer_hbox_pack_end (hbox, cell, FALSE);
@@ -1399,12 +1385,12 @@ mail_folder_view_construct (MailFolderView *shell)
/* Create a cell renderer for Subject */
cell = gtk_cell_renderer_text_new ();
if (shell->priv->light)
- g_object_set_data (cell, "data", GINT_TO_POINTER (COL_SUBJECT));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (COL_SUBJECT));
else
- g_object_set_data (cell, "data", GINT_TO_POINTER (EMTS_COL_SUBJECT));
- g_object_set_data (cell, "p-ellipsize", GINT_TO_POINTER (1));
- g_object_set_data (cell, "p-bold", GINT_TO_POINTER (1));
- g_object_set_data (cell, "p-strike", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (EMTS_COL_SUBJECT));
+ g_object_set_data ((GObject *)cell, "p-ellipsize", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-bold", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-strike", GINT_TO_POINTER (1));
/* Append, subject to second row. */
custom_cell_renderer_vbox_append (vbox, cell);
@@ -1416,11 +1402,11 @@ mail_folder_view_construct (MailFolderView *shell)
// custom_cell_renderer_vbox_append (vbox, hbox);
cell = gtk_cell_renderer_text_new ();
- g_object_set_data (cell, "data", GINT_TO_POINTER (EMTS_COL_THREADPREVIEW));
- g_object_set_data (cell, "p-ellipsize", GINT_TO_POINTER (1));
- g_object_set_data (cell, "p-bold", GINT_TO_POINTER (0));
- g_object_set_data (cell, "p-strike", GINT_TO_POINTER (1));
- g_object_set_data (cell, "p-markup", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "data", GINT_TO_POINTER (EMTS_COL_THREADPREVIEW));
+ g_object_set_data ((GObject *)cell, "p-ellipsize", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-bold", GINT_TO_POINTER (0));
+ g_object_set_data ((GObject *)cell, "p-strike", GINT_TO_POINTER (1));
+ g_object_set_data ((GObject *)cell, "p-markup", GINT_TO_POINTER (1));
// custom_cell_renderer_hbox_pack_start (hbox, cell, FALSE);
custom_cell_renderer_vbox_append (vbox, cell);
}
@@ -1434,42 +1420,42 @@ mail_folder_view_construct (MailFolderView *shell)
/* Another VBox for Delete/Junk */
vbox = custom_cell_renderer_vbox_new ();
- g_object_set_data (vbox, "mfv", shell);
- g_object_set (vbox, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
+ g_object_set_data ((GObject *)vbox, "mfv", shell);
+ g_object_set ((GObject *)vbox, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
gtk_tree_view_column_pack_end (column, vbox, FALSE);
- gtk_tree_view_column_set_cell_data_func (column, vbox, draw_img, NULL, NULL);
+ gtk_tree_view_column_set_cell_data_func (column, vbox, (GtkTreeCellDataFunc)draw_img, NULL, NULL);
/* Cell rendere for Delete */
cell = custom_cell_renderer_toggle_pixbuf_new (e_icon_factory_get_icon ("stock_delete", E_ICON_SIZE_MENU), e_icon_factory_get_icon ("stock_delete", E_ICON_SIZE_MENU));
- g_object_set_data (cell, "mfv", shell);
+ g_object_set_data ((GObject *)cell, "mfv", shell);
custom_cell_renderer_vbox_append (vbox, cell);
- g_object_set_data (cell, "data", "stock_delete");
- g_object_set_data (cell, "sel-highlight", GINT_TO_POINTER(1));
- g_object_set_data (cell, "activate_func", mfv_msg_delete);
+ g_object_set_data ((GObject *)cell, "data", "stock_delete");
+ g_object_set_data ((GObject *)cell, "sel-highlight", GINT_TO_POINTER(1));
+ g_object_set_data ((GObject *)cell, "activate_func", mfv_msg_delete);
/* Empty image */
if (!shell->priv->light) {
cell = gtk_cell_renderer_pixbuf_new ();
custom_cell_renderer_vbox_append (vbox, cell);
- g_object_set_data (cell, "data", NULL);
- g_object_set_data (cell, "activate_func", NULL);
+ g_object_set_data ((GObject *)cell, "data", NULL);
+ g_object_set_data ((GObject *)cell, "activate_func", NULL);
}
/* Cell rendere for Junk */
cell = custom_cell_renderer_toggle_pixbuf_new (e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU), e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU));
- g_object_set_data (cell, "mfv", shell);
+ g_object_set_data ((GObject *)cell, "mfv", shell);
custom_cell_renderer_vbox_append (vbox, cell);
- g_object_set_data (cell, "sel-highlight", GINT_TO_POINTER(1));
- g_object_set_data (cell, "data", "mail-mark-junk");
- g_object_set_data (cell, "activate_func", mfv_msg_junk);
+ g_object_set_data ((GObject *)cell, "sel-highlight", GINT_TO_POINTER(1));
+ g_object_set_data ((GObject *)cell, "data", "mail-mark-junk");
+ g_object_set_data ((GObject *)cell, "activate_func", mfv_msg_junk);
gtk_tree_view_columns_autosize (shell->tree);
shell->mail = mail_conv_view_new ();
- gtk_box_pack_start (viewbox, shell->mail, TRUE, TRUE, 0);
- gtk_widget_hide (shell->mail);
+ gtk_box_pack_start ((GtkBox *)viewbox, (GtkWidget *)shell->mail, TRUE, TRUE, 0);
+ gtk_widget_hide ((GtkWidget *)shell->mail);
}
MailFolderView *
@@ -1497,11 +1483,11 @@ static void
mfv_set_sort (GtkCheckMenuItem *item, MailFolderView *view)
{
if (gtk_check_menu_item_get_active (item)) {
- if (GPOINTER_TO_INT(g_object_get_data(item, "data")) != view->priv->sort_selected) {
- view->priv->sort_selected = GPOINTER_TO_INT(g_object_get_data(item, "data"));
+ if (GPOINTER_TO_INT(g_object_get_data((GObject *)item, "data")) != view->priv->sort_selected) {
+ view->priv->sort_selected = GPOINTER_TO_INT(g_object_get_data((GObject *)item, "data"));
((EMTreeStore *)view->model)->func = sorting[view->priv->sort_selected-1].func;
- em_tree_store_resort (view->model);
- gtk_widget_queue_draw (view->tree);
+ em_tree_store_resort ((EMTreeStore *)view->model);
+ gtk_widget_queue_draw ((GtkWidget *)view->tree);
}
}
@@ -1511,11 +1497,11 @@ static void
mfv_set_sort_state (GtkCheckMenuItem *item, MailFolderView *view)
{
if (gtk_check_menu_item_get_active (item)) {
- if ((GPOINTER_TO_INT(g_object_get_data(item, "data")) != 0) != view->priv->sort_ascending) {
- view->priv->sort_ascending= GPOINTER_TO_INT(g_object_get_data(item, "data")) != 0;
+ if ((GPOINTER_TO_INT(g_object_get_data((GObject *)item, "data")) != 0) != view->priv->sort_ascending) {
+ view->priv->sort_ascending= GPOINTER_TO_INT(g_object_get_data((GObject *)item, "data")) != 0;
((EMTreeStore *)view->model)->sort_ascending = view->priv->sort_ascending;
- em_tree_store_resort (view->model);
- gtk_widget_queue_draw (view->tree);
+ em_tree_store_resort ((EMTreeStore *)view->model);
+ gtk_widget_queue_draw ((GtkWidget *)view->tree);
}
}
}
@@ -1529,41 +1515,41 @@ mail_folder_view_show_sort_popup (MailFolderView *mfv, GtkWidget *button)
int cnt =G_N_ELEMENTS(sorting), i;
item =gtk_radio_menu_item_new_with_mnemonic (NULL, _("_Ascending"));
- g_object_set_data (item, "data", GINT_TO_POINTER(1));
+ g_object_set_data ((GObject *)item, "data", GINT_TO_POINTER(1));
g_signal_connect (item, "toggled", G_CALLBACK (mfv_set_sort_state), mfv);
- gtk_menu_shell_append (menu, item);
+ gtk_menu_shell_append ((GtkMenuShell *)menu, item);
if (mfv->priv->sort_ascending)
- gtk_check_menu_item_set_active (item, TRUE);
+ gtk_check_menu_item_set_active ((GtkCheckMenuItem *)item, TRUE);
gtk_widget_show (item);
- item =gtk_radio_menu_item_new_with_mnemonic_from_widget (item, _("D_escending"));
- g_object_set_data (item, "data", GINT_TO_POINTER(0));
+ item =gtk_radio_menu_item_new_with_mnemonic_from_widget ((GtkRadioMenuItem *)item, _("D_escending"));
+ g_object_set_data ((GObject *)item, "data", GINT_TO_POINTER(0));
g_signal_connect (item, "toggled", G_CALLBACK (mfv_set_sort_state), mfv);
- gtk_menu_shell_append (menu, item);
+ gtk_menu_shell_append ((GtkMenuShell *)menu, item);
if (!mfv->priv->sort_ascending)
- gtk_check_menu_item_set_active (item, TRUE);
+ gtk_check_menu_item_set_active ((GtkCheckMenuItem *)item, TRUE);
gtk_widget_show (item);
item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (menu, item);
+ gtk_menu_shell_append ((GtkMenuShell *)menu, item);
gtk_widget_show (item);
for (i=0; i<cnt; i++) {
if (titem)
- item = gtk_radio_menu_item_new_with_mnemonic_from_widget (titem, sorting[i].label);
+ item = gtk_radio_menu_item_new_with_mnemonic_from_widget ((GtkRadioMenuItem *)titem, sorting[i].label);
else
item = gtk_radio_menu_item_new_with_mnemonic (NULL, sorting[i].label);
- g_object_set_data (item, "data", GINT_TO_POINTER(sorting[i].value));
+ g_object_set_data ((GObject *)item, "data", GINT_TO_POINTER(sorting[i].value));
g_signal_connect (item, "toggled", G_CALLBACK (mfv_set_sort), mfv);
- gtk_menu_shell_append (menu, item);
+ gtk_menu_shell_append ((GtkMenuShell *)menu, item);
gtk_widget_show (item);
if (!titem)
titem = item;
if (mfv->priv->sort_selected == sorting[i].value)
- gtk_check_menu_item_set_active (item, TRUE);
+ gtk_check_menu_item_set_active ((GtkCheckMenuItem *)item, TRUE);
}
- gtk_menu_popup(menu, NULL, NULL, (GtkMenuPositionFunc)popup_place_widget, button, 0, gtk_get_current_event_time());
+ gtk_menu_popup((GtkMenu *)menu, NULL, NULL, (GtkMenuPositionFunc)popup_place_widget, button, 0, gtk_get_current_event_time());
}
void
@@ -1576,7 +1562,7 @@ mail_folder_view_activate (MailFolderView *mfv, GtkWidget *tree, GtkWidget *fold
gtk_widget_set_sensitive (check_mail, act);
gtk_widget_set_sensitive (sort_by, act);
if (mfv->priv->folder) {
- em_folder_tree_set_selected (tree, mfv->uri, FALSE);
+ em_folder_tree_set_selected ((EMFolderTree *)tree, mfv->uri, FALSE);
}
}
@@ -1618,7 +1604,7 @@ mail_folder_view_set_search (MailFolderView *mfv, const char *search)
m->load = FALSE;
m->uri = g_strdup(mfv->uri);
m->folder = mfv->priv->folder;
- m->done = mail_folder_view_search_done;
+ m->done = (MailMsgDoneFunc)mail_folder_view_search_done;
mail_msg_unordered_push (m);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
