GNOME.org
 

[anjal] fix hella lot of mail view warnings. Infact it fixed some crasher bug as well

commit c165911b5be898e11e659491855ecb8ceb60f89e
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Fri May 29 01:14:25 2009 +0530

    fix hella lot of mail view warnings. Infact it fixed some crasher bug as well
---
 src/mail-view.c |  166 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/src/mail-view.c b/src/mail-view.c
index f6879c2..9e63016 100644
--- a/src/mail-view.c
+++ b/src/mail-view.c
@@ -39,7 +39,7 @@ struct  _MailViewPrivate {
 
 	GtkWidget *box;
 	GList *children;
-	MailFolderView *current_view;
+	MailViewChild *current_view;
 	GtkWidget *new;
 };
 
@@ -81,12 +81,14 @@ mail_view_class_init (MailViewClass *klass)
 
 };
 
+#ifdef MV_NEW_TAB
 static void
 mv_new_page (GtkButton *w, MailView *mv)
 {
 	mail_view_add_page (mv, MAIL_VIEW_FOLDER);
 	gtk_notebook_set_current_page (mv, g_list_length (mv->priv->children)-1);
 }
+#endif
 
 static void
 mv_switch (GtkNotebook     *notebook,GtkNotebookPage *page, guint page_num, gpointer user_data)
@@ -109,13 +111,13 @@ mv_switch (GtkNotebook     *notebook,GtkNotebookPage *page, guint page_num, gpoi
 			 priv->current_view = node->data;
 		child = (MailViewChild *)priv->current_view;
 		if (child->type == MAIL_VIEW_COMPOSER)
-			 mail_composer_view_activate (child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
+			 mail_composer_view_activate ((MailComposerView *)child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
 		else if (child->type == MAIL_VIEW_MESSAGE)
-			 mail_conv_view_activate (child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+			 mail_conv_view_activate ((MailConvView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
 		else if (child->type == MAIL_VIEW_FOLDER) /* For some reason, Im not able to get right type */
-			 mail_folder_view_activate (child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
+			 mail_folder_view_activate ((MailFolderView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
 		else if (child->type == MAIL_VIEW_ACCOUNT)
-			mail_account_view_activate (child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+			mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
 		
 		
 #ifdef MV_NEW_TAB		
@@ -123,6 +125,8 @@ mv_switch (GtkNotebook     *notebook,GtkNotebookPage *page, guint page_num, gpoi
 #endif	
 }
 
+
+#ifdef MV_NEW_TAB
 static gboolean
 mv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailView *mv)
 {
@@ -164,15 +168,14 @@ mv_new_tab_button (MailView *shell)
 	shell->priv->new = box;
 	position = gtk_notebook_append_page (shell, box, label);
 }
+#endif
 
 void
 mail_view_construct (MailView *shell)
 {
-	MailViewPrivate *priv = shell->priv;
-	
-	gtk_notebook_set_show_tabs (shell, TRUE);
-	gtk_notebook_set_scrollable (shell, TRUE);
-	gtk_notebook_popup_enable (shell);
+	gtk_notebook_set_show_tabs ((GtkNotebook *)shell, TRUE);
+	gtk_notebook_set_scrollable ((GtkNotebook *)shell, TRUE);
+	gtk_notebook_popup_enable ((GtkNotebook *)shell);
 #ifdef MV_NEW_TAB	
 	mv_new_tab_button (shell);
 #endif	
@@ -191,7 +194,7 @@ mail_view_new ()
 static void
 mv_message_shown (MailFolderView *mfv, MailView *mv)
 {
-	GtkWidget *arr = g_object_get_data (mv->slider, "right-arrow");
+	GtkWidget *arr = g_object_get_data ((GObject *)mv->slider, "right-arrow");
 	gtk_widget_hide (mv->folder_tree);
 	gtk_widget_show (arr);
 	gtk_widget_show (mv->slider);
@@ -212,31 +215,31 @@ list_data_pos (GList *list, gpointer data)
 }
 
 static void
-mv_close_mcv (MailFolderView *mfv, MailView *mv)
+mv_close_mcv (MailViewChild *mfv, MailView *mv)
 {
 	int n = list_data_pos (mv->priv->children, mfv);
-	int pos = gtk_notebook_get_current_page (mv);
+	int pos = gtk_notebook_get_current_page ((GtkNotebook *)mv);
 	MailViewChild *child;
 
 	if (g_list_length(mv->priv->children) == 1)
 		return;
 	g_signal_handlers_block_by_func(mv, mv_switch, mv);
-	gtk_notebook_remove_page (mv, n);
+	gtk_notebook_remove_page ((GtkNotebook *)mv, n);
 	g_signal_handlers_unblock_by_func(mv, mv_switch, mv);
 	if (pos == g_list_length(mv->priv->children) -1)
-		 gtk_notebook_set_current_page (mv, pos -1);
+		 gtk_notebook_set_current_page ((GtkNotebook *)mv, pos -1);
 	mv->priv->children  = g_list_remove (mv->priv->children, mfv);
-	pos = gtk_notebook_get_current_page (mv);
+	pos = gtk_notebook_get_current_page ((GtkNotebook *)mv);
 	child = g_list_nth_data(mv->priv->children, pos);
 	mv->priv->current_view = child;
 	if (child->type == MAIL_VIEW_COMPOSER)
-		 mail_composer_view_activate (child, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
+		 mail_composer_view_activate ((MailComposerView *)child, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
 	else if (child->type == MAIL_VIEW_MESSAGE)
-		 mail_conv_view_activate (child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+		 mail_conv_view_activate ((MailConvView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_FOLDER)  /* For some reason, the child type for mfv isn't getting right: FIXME later*/
-		 mail_folder_view_activate (child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
+		 mail_folder_view_activate ((MailFolderView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
 	else if (child->type == MAIL_VIEW_ACCOUNT)
-		mail_account_view_activate (child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+		mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
 	
 }
@@ -259,19 +262,19 @@ mail_view_add_folder (MailView *mv)
 	MailFolderView *mfv = mail_folder_view_new ();
 	gint position = 0;
 	mail_folder_view_set_folder_pane (mfv, mv->folder_tree);
-	mv->priv->current_view = mfv;
+	mv->priv->current_view = (MailViewChild *)mfv;
 	mv->priv->children = g_list_append (mv->priv->children,  mfv);
-	position = gtk_notebook_append_page (mv, mfv, mfv->tab_label);
+	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mfv, mfv->tab_label);
 	g_signal_connect (mfv, "view-close", G_CALLBACK(mv_close_mcv), mv);
-	gtk_notebook_set_tab_reorderable (mv, mfv, TRUE);
-	gtk_notebook_set_current_page (mv, position);
-	gtk_notebook_set_tab_label_packing (mv, mfv, FALSE, FALSE, 0);
+	gtk_notebook_set_tab_reorderable ((GtkNotebook *)mv, (GtkWidget *)mfv, TRUE);
+	gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mfv, FALSE, FALSE, 0);
 	g_signal_connect (mfv, "message-shown", G_CALLBACK(mv_message_shown), mv);
 	g_signal_connect (mfv, "message-new", G_CALLBACK(mv_message_new), mv);
 
 	mail_folder_view_activate (mfv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
 
-	return mfv;
+	return (MailViewChild *)mfv;
 }
 
 static MailViewChild *
@@ -280,18 +283,18 @@ mail_view_add_composer (MailView *mv)
 	MailComposerView *mcv = mail_composer_view_new ();
 	gint position = 0;
 
-	mv->priv->current_view = mcv;
+	mv->priv->current_view = (MailViewChild *)mcv;
 	mv->priv->children = g_list_append (mv->priv->children,  mcv);
 	
-	position = gtk_notebook_append_page (mv, mcv, mcv->tab_label); 
-	gtk_notebook_set_tab_reorderable (mv, mcv, TRUE);
-	gtk_notebook_set_current_page (mv, position);
-	gtk_notebook_set_tab_label_packing (mv, mcv, FALSE, FALSE, 0);
+	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label); 
+	gtk_notebook_set_tab_reorderable ((GtkNotebook *)mv, (GtkWidget *)mcv, TRUE);
+	gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mcv, FALSE, FALSE, 0);
 	mail_composer_view_activate (mcv, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
 	g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 
-	return mcv;
+	return (MailViewChild *)mcv;
 }
 
 static MailViewChild *
@@ -300,20 +303,20 @@ mail_view_add_message (MailView *mv)
 	MailConvView *mcv = mail_conv_view_new ();
 	gint position = 0;
 
-	gtk_widget_show (mcv);
+	gtk_widget_show ((GtkWidget *)mcv);
 	mcv->type = MAIL_VIEW_MESSAGE;
-	mv->priv->current_view = mcv;
+	mv->priv->current_view = (MailViewChild *)mcv;
 	mv->priv->children = g_list_append (mv->priv->children,  mcv);
 	
-	position = gtk_notebook_append_page (mv, mcv, mail_conv_view_get_tab_widget(mcv)); 
-	gtk_notebook_set_tab_reorderable (mv, mcv, TRUE);
-	gtk_notebook_set_current_page (mv, position);
-	gtk_notebook_set_tab_label_packing (mv, mcv, FALSE, FALSE, 0);
+	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mail_conv_view_get_tab_widget(mcv)); 
+	gtk_notebook_set_tab_reorderable ((GtkNotebook *)mv, (GtkWidget *)mcv, TRUE);
+	gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mcv, FALSE, FALSE, 0);
 	mail_conv_view_activate (mcv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
 	g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 
-	return mcv;
+	return (MailViewChild *)mcv;
 }
 
 static void
@@ -328,17 +331,17 @@ mail_view_add_settings (MailView *mv)
 	MailSettingsView *msv  = mail_settings_view_new ();
 	gint position = 0;
 	
-	gtk_widget_show (msv);
-	mv->priv->current_view = msv;
+	gtk_widget_show ((GtkWidget *)msv);
+	mv->priv->current_view = (MailViewChild *)msv;
 	mv->priv->children = g_list_append (mv->priv->children,  msv);
-	position = gtk_notebook_append_page (mv, msv, mail_settings_view_get_tab_widget(msv));
+	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_settings_view_get_tab_widget(msv));
 	g_signal_connect (msv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 	g_signal_connect (msv, "show-account", G_CALLBACK(mv_show_acc_mcv), mv);
-	gtk_notebook_set_tab_reorderable (mv, msv, TRUE);
-	gtk_notebook_set_current_page (mv, position);
-	gtk_notebook_set_tab_label_packing (mv, msv, FALSE, FALSE, 0);
+	gtk_notebook_set_tab_reorderable ((GtkNotebook *)mv, (GtkWidget *)msv, TRUE);
+	gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0);
 
-	return msv;
+	return (MailViewChild *)msv;
 }
 
 static MailViewChild *
@@ -347,17 +350,17 @@ mail_view_add_account (MailView *mv)
 	MailAccountView *msv  = mail_account_view_new (NULL);
 	gint position = 0;
 	
-	gtk_widget_show (msv);
-	mv->priv->current_view = msv;
+	gtk_widget_show ((GtkWidget *)msv);
+	mv->priv->current_view = (MailViewChild *)msv;
 	mv->priv->children = g_list_append (mv->priv->children,  msv);
-	position = gtk_notebook_append_page (mv, msv, mail_account_view_get_tab_widget(msv));
+	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_account_view_get_tab_widget(msv));
 	g_signal_connect_after (msv, "view-close", G_CALLBACK(mv_close_mcv), mv);
-	gtk_notebook_set_tab_reorderable (mv, msv, TRUE);
-	gtk_notebook_set_current_page (mv, position);
-	gtk_notebook_set_tab_label_packing (mv, msv, FALSE, FALSE, 0);
+	gtk_notebook_set_tab_reorderable ((GtkNotebook *)mv, (GtkWidget *)msv, TRUE);
+	gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0);
 	mail_account_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
-	return msv;
+	return (MailViewChild *)msv;
 }
 
 MailViewChild *
@@ -384,7 +387,7 @@ mail_view_add_page (MailView *mv, guint16 type)
 		child = mail_view_add_account (mv);
 		break;	
 	}
-	gtk_widget_grab_focus(child);
+	gtk_widget_grab_focus((GtkWidget *)child);
 	child->type = type;
 #ifdef MV_NEW_TAB	
 	gtk_notebook_reorder_child (mv, mv->priv->new, -1);
@@ -403,7 +406,7 @@ mv_switch_folder_view (MailView *mv, const char *uri)
 	 while (tmp) {
 		  MailViewChild *child = tmp->data;
 		  if (child->type == MAIL_VIEW_FOLDER && !strcmp (uri, child->uri)) {
-			   gtk_notebook_set_current_page (mv, i);
+			   gtk_notebook_set_current_page ((GtkNotebook *)mv, i);
 			   return;
 		  }
 		  i++;
@@ -411,7 +414,7 @@ mv_switch_folder_view (MailView *mv, const char *uri)
 	 }
 
 	 mail_view_add_page (mv, MAIL_VIEW_FOLDER);
-	 mail_folder_view_set_folder_uri (mv->priv->current_view, uri);
+	 mail_folder_view_set_folder_uri ((MailFolderView *)mv->priv->current_view, uri);
 }
 
 static MailConvView *
@@ -422,15 +425,15 @@ mv_switch_message_view (MailView *mv, const char *uri)
 	 while (tmp) {
 		  MailViewChild *child = tmp->data;
 		  if (child->type == MAIL_VIEW_MESSAGE && !strcmp (uri, child->uri)) {
-			   gtk_notebook_set_current_page (mv, i);
-			   mail_conv_view_activate (child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+			   gtk_notebook_set_current_page ((GtkNotebook *)mv, i);
+			   mail_conv_view_activate ((MailConvView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 			   return NULL;
 		  }
 		  i++;
 		  tmp = tmp->next;
 	 }
 
-	 return mail_view_add_page (mv, MAIL_VIEW_MESSAGE);
+	 return (MailConvView *)mail_view_add_page (mv, MAIL_VIEW_MESSAGE);
 }
 
 void
@@ -443,18 +446,18 @@ mail_view_set_folder_uri (MailView *mv, const char *uri)
 void
 mail_view_show_sort_popup (MailView *mv, GtkWidget *button)
 {
-	mail_folder_view_show_sort_popup (mv->priv->current_view, button);
+	mail_folder_view_show_sort_popup ((MailFolderView *)mv->priv->current_view, button);
 }
 
 void
 mail_view_show_list (MailView *mv)
 {
-	 MailViewChild *child = mv->priv->current_view;
+	 MailViewChild *child = (MailViewChild *)mv->priv->current_view;
 
 	 if (child->type == MAIL_VIEW_MESSAGE || child->type == MAIL_VIEW_COMPOSER)
 		  mv_close_mcv (child, mv);
 	 else
-		  mail_folder_view_show_list (mv->priv->current_view);
+		  mail_folder_view_show_list ((MailFolderView *)mv->priv->current_view);
 
 		  
 }
@@ -464,7 +467,7 @@ mv_slider_clicked (GtkButton *slider, MailView *mv)
 {
 	gtk_widget_hide (mv->slider);
 	gtk_widget_show (mv->folder_tree);
-	mail_folder_view_show_list (mv->priv->current_view);
+	mail_folder_view_show_list ((MailFolderView *)mv->priv->current_view);
 }
 
 void
@@ -487,14 +490,14 @@ mv_tree_click_cb (GtkWidget *w, GdkEventButton *event, MailView *mv)
 		  GtkTreeSelection *selection;
 		  GtkTreePath *tree_path;
 		  
-		  if (!gtk_tree_view_get_path_at_pos (w, (int) event->x, (int) event->y, &tree_path, NULL, NULL, NULL))
+		  if (!gtk_tree_view_get_path_at_pos ((GtkTreeView *)w, (int) event->x, (int) event->y, &tree_path, NULL, NULL, NULL))
 			   return FALSE;
 		  mail_view_add_page (mv, MAIL_VIEW_FOLDER);
-		  gtk_notebook_set_current_page (mv, g_list_length (mv->priv->children)-1);
-		  selection = gtk_tree_view_get_selection (w);
+		  gtk_notebook_set_current_page ((GtkNotebook *)mv, g_list_length (mv->priv->children)-1);
+		  selection = gtk_tree_view_get_selection ((GtkTreeView *)w);
 		  gtk_tree_selection_unselect_path (selection, tree_path);
 		  gtk_tree_selection_select_path(selection, tree_path);
-		  gtk_tree_view_set_cursor (w, tree_path, NULL, FALSE);
+		  gtk_tree_view_set_cursor ((GtkTreeView *)w, tree_path, NULL, FALSE);
 
 
 		  return TRUE;
@@ -506,8 +509,8 @@ void
 mail_view_set_folder_tree (MailView *mv, GtkWidget *tree)
 {
 	mv->tree = tree;
-	em_folder_tree_set_skip_double_click (tree, FALSE);
-	g_signal_connect (em_folder_tree_get_tree_view(tree), "button-press-event", G_CALLBACK(mv_tree_click_cb), mv);
+	em_folder_tree_set_skip_double_click ((EMFolderTree *)tree, FALSE);
+	g_signal_connect ((GObject *)em_folder_tree_get_tree_view((EMFolderTree *)tree), "button-press-event", G_CALLBACK(mv_tree_click_cb), mv);
 }
 
 void
@@ -525,37 +528,38 @@ mail_view_set_sort_by  (MailView *mv, GtkWidget *button)
 static void
 mv_spinner_show (MailView *mv, gboolean show)
 {
-	 GtkWidget *spinner = g_object_get_data (mv->check_mail, "spinner");
-	 GtkWidget *icon = g_object_get_data (mv->check_mail, "icon");
+	 GtkWidget *spinner = g_object_get_data ((GObject *)mv->check_mail, "spinner");
+	 GtkWidget *icon = g_object_get_data ((GObject *)mv->check_mail, "icon");
 
 	 if(show) {
 		  gtk_widget_show (spinner);
 		  gtk_widget_hide(icon);
-		  gtk_button_set_relief (mv->check_mail, GTK_RELIEF_NORMAL);
+		  gtk_button_set_relief ((GtkButton *)mv->check_mail, GTK_RELIEF_NORMAL);
 		  
 	 } else {
 		  gtk_widget_show (icon);
 		  gtk_widget_hide(spinner);
-		  gtk_button_set_relief (mv->check_mail, GTK_RELIEF_NONE);
+		  gtk_button_set_relief ((GtkButton *)mv->check_mail, GTK_RELIEF_NONE);
 	 }
 }
 
 static void
-mv_spinner_done (CamelFolder *f, MailView *mv)
+mv_spinner_done (CamelFolder *f, gpointer data)
 {
+	MailView *mv = (MailView *)data;
 	 mv_spinner_show (mv, FALSE);
 }
 
 void
 mail_view_check_mail(MailView *mv)
 {
-	 MailViewChild *child = mv->priv->current_view;
+	 MailViewChild *child = (MailViewChild *)mv->priv->current_view;
 	 
 	 if (child->type == MAIL_VIEW_FOLDER) {
-		  mail_folder_view_check_mail (child);
+		  mail_folder_view_check_mail ((MailFolderView *)child);
 		  CamelFolder *folder;
 		  
-		  if ((folder = em_folder_tree_get_selected_folder (mv->tree)) != NULL) {
+		  if ((folder = em_folder_tree_get_selected_folder ((EMFolderTree *)mv->tree)) != NULL) {
 			   mv_spinner_show (mv, TRUE);
 			   mail_refresh_folder(folder, mv_spinner_done, mv);
 		  }
@@ -572,7 +576,7 @@ mail_view_save (MailView *mv)
 	 while (child) {
 		  cview = (MailViewChild *)child->data;
 		  if (cview->type == MAIL_VIEW_FOLDER) {
-			   mail_folder_view_save (cview);
+			   mail_folder_view_save ((MailFolderView *)cview);
 		  }
 		  child = child->next;
 	 }
@@ -581,9 +585,9 @@ mail_view_save (MailView *mv)
 void
 mail_view_set_search (MailView *mv, const char *search)
 {
-	MailViewChild *child = mv->priv->current_view;
+	MailViewChild *child = (MailViewChild *)mv->priv->current_view;
 
-	if (child->type = MAIL_VIEW_FOLDER) {
-		mail_folder_view_set_search (child, search);
+	if (child->type == MAIL_VIEW_FOLDER) {
+		mail_folder_view_set_search ((MailFolderView *)child, search);
 	}
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]