[anjal] Fix warnings



commit 884f504a772831ee45678dc169d9a9c8899a87be
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Fri May 29 11:54:40 2009 +0530

    Fix warnings
---
 src/mail-conv-view.c |   74 +++++++++++++++++++++++---------------------------
 1 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/src/mail-conv-view.c b/src/mail-conv-view.c
index 46e409d..f265ccc 100644
--- a/src/mail-conv-view.c
+++ b/src/mail-conv-view.c
@@ -82,7 +82,6 @@ mcv_key_press (GtkWidget  *widget, GdkEventKey *event)
 {
 	MailConvView *shell = (MailConvView *)widget;
 	MailConvViewPrivate *priv = shell->priv;
-	gboolean down = TRUE;
 
 	switch (event->keyval) {
 /*	case GDK_KP_Right:
@@ -112,7 +111,7 @@ mcv_key_press (GtkWidget  *widget, GdkEventKey *event)
 				priv->selected_child->next : priv->selected_child;
 		} else {
 			// Scroll by small steps
-			GtkAdjustment *adj = gtk_viewport_get_vadjustment (shell->priv->viewport);
+			GtkAdjustment *adj = gtk_viewport_get_vadjustment ((GtkViewport *)shell->priv->viewport);
 			gdouble step = gtk_adjustment_get_step_increment (adj);
 			gdouble new = gtk_adjustment_get_value (adj) + step;
 			gdouble max = gtk_adjustment_get_upper (adj);
@@ -126,7 +125,7 @@ mcv_key_press (GtkWidget  *widget, GdkEventKey *event)
 				priv->selected_child->prev : priv->selected_child;
 		} else {
 			// Scroll by small steps
-			GtkAdjustment *adj = gtk_viewport_get_vadjustment (shell->priv->viewport);
+			GtkAdjustment *adj = gtk_viewport_get_vadjustment ((GtkViewport *)shell->priv->viewport);
 			gdouble step = gtk_adjustment_get_step_increment (adj);
 			gdouble new = gtk_adjustment_get_value (adj) - step;
 			gdouble min = gtk_adjustment_get_lower (adj);
@@ -136,7 +135,7 @@ mcv_key_press (GtkWidget  *widget, GdkEventKey *event)
 	case GDK_space:
 	case GDK_KP_Space:
 	{
-		GtkAdjustment *adj = gtk_viewport_get_vadjustment (shell->priv->viewport);
+		GtkAdjustment *adj = gtk_viewport_get_vadjustment ((GtkViewport *)shell->priv->viewport);
 		gdouble page_inc  = gtk_adjustment_get_page_increment (adj);
 		gdouble page_size = gtk_adjustment_get_upper (adj);
 		gdouble val = gtk_adjustment_get_value(adj);
@@ -191,7 +190,6 @@ mcv_sh_color_expose (GtkWidget *w, GdkEventExpose *event, const char *color)
 	cairo_t *cr = gdk_cairo_create (w->window);
 	int wid = w->allocation.width;
 	int heig = w->allocation.height;
-	GtkStyle *style = gtk_widget_get_default_style ();
 	GdkColor colr;
 
 	gdk_color_parse ( color, &colr);
@@ -208,7 +206,7 @@ static void
 mcv_adjust_scroll(MailConvView *mcv, MailMessageView *mmv)
 {
 	int x, y, height, ret;
-	GtkAdjustment *adj = gtk_viewport_get_vadjustment(mcv->priv->viewport);
+	GtkAdjustment *adj = gtk_viewport_get_vadjustment((GtkViewport *)mcv->priv->viewport);
 	if (!((GtkContainer *)mcv->child_box)->focus_child)
 		return;
 	ret = gtk_widget_translate_coordinates (mcv->priv->selected_child->data, mcv->child_box, 0, 0, &x, &y);
@@ -227,7 +225,7 @@ static int
 mcv_sh_focus_expose (GtkWidget *w, GdkEventExpose *event, MailConvView *mcv)
 {
 	int x, y, height, ret;
-	GtkAdjustment *adj = gtk_viewport_get_vadjustment(mcv->priv->viewport);
+	GtkAdjustment *adj = gtk_viewport_get_vadjustment((GtkViewport *)mcv->priv->viewport);
 
 	if (!mcv->priv->once) {
 		mcv->priv->once = TRUE;
@@ -276,7 +274,7 @@ mcv_free_node (MailConvView *mcv, MailMessageView *mmv, GList *node)
 			   gtk_widget_grab_focus (mcv->priv->selected_child->data);
 		  
 	 }
-	 gtk_widget_destroy (mmv);
+	 gtk_widget_destroy ((GtkWidget *)mmv);
 	 g_list_free_1 (node);
 }
 
@@ -316,8 +314,8 @@ mcv_message_removed (MailMessageView *mmv, MailConvView *mcv)
 static void
 mcv_message_reply (MailMessageView *mmv, MailConvView *mcv)
 {
-	int x, y, height, ret;
-	GtkAdjustment *adj = gtk_viewport_get_vadjustment(mcv->priv->viewport);
+	int x, y, ret;
+	GtkAdjustment *adj = gtk_viewport_get_vadjustment((GtkViewport *)mcv->priv->viewport);
 
 	ret = gtk_widget_translate_coordinates (mail_message_view_get_focus_widget (mmv), mmv->comp_view, 0, 0, &x, &y);
 	gtk_adjustment_clamp_page (adj, y, y+((GtkWidget *)mmv)->allocation.height);
@@ -331,45 +329,45 @@ mail_conv_view_set_thread (MailConvView *mcv, CamelFolder *folder, GPtrArray *ar
 	int i;
 	GList *focus = NULL;
 	extern char *scolor_bg_norm;
-	GtkWidget *unread = NULL, *unread_parent;
+	GtkWidget *unread = NULL;
 
 	if (mcv->child_box) {
 		tmp = mcv->child_box;
 		gtk_widget_hide (tmp);
-		gtk_container_remove (mcv->priv->viewport, tmp);
+		gtk_container_remove ((GtkContainer *)mcv->priv->viewport, tmp);
 	}
 	mcv->child_box = gtk_vbox_new (FALSE, 0);
 	mcv->priv->once = FALSE;
-	gtk_container_set_focus_vadjustment (mcv->child_box, gtk_viewport_get_vadjustment (mcv->priv->viewport));
+	gtk_container_set_focus_vadjustment ((GtkContainer *)mcv->child_box, gtk_viewport_get_vadjustment ((GtkViewport *)mcv->priv->viewport));
 	gtk_widget_show (mcv->child_box);
 	g_signal_connect (mcv->child_box, "expose-event",
 					  G_CALLBACK (mcv_sh_color_expose),
 					  scolor_bg_norm);
 
-	gtk_container_add (mcv->priv->viewport, mcv->child_box);
+	gtk_container_add ((GtkContainer *)mcv->priv->viewport, mcv->child_box);
 	
 	for (i=0; i<array->len; i++) {
 		GtkWidget *child;
 		
-		child = mail_message_view_new ();
-		gtk_box_pack_start (mcv->child_box, child, FALSE, FALSE, 4);
+		child = (GtkWidget *)mail_message_view_new ();
+		gtk_box_pack_start ((GtkBox *)mcv->child_box, child, FALSE, FALSE, 4);
 		gtk_widget_show (child);
 		
-		mail_message_view_set_message (child, folder, array->pdata[i]);
+		mail_message_view_set_message ((MailMessageView *)child, folder, array->pdata[i]);
 		g_signal_connect (child, "message-selected", G_CALLBACK(mcv_message_selected), mcv);
 		g_signal_connect (child, "message-removed", G_CALLBACK(mcv_message_removed), mcv);
 		g_signal_connect (child, "message-reply", G_CALLBACK(mcv_message_reply), mcv);
-		focus = g_list_prepend (focus, mail_message_view_get_focus_widget(child));
+		focus = g_list_prepend (focus, (gpointer)mail_message_view_get_focus_widget((MailMessageView *)child));
 		if (!unread) {
-			if (mail_message_view_get_unread (child))
-				unread = mail_message_view_get_focus_widget(child);
+			if (mail_message_view_get_unread ((MailMessageView *)child))
+				unread = mail_message_view_get_focus_widget((MailMessageView *)child);
 				g_signal_connect (child, "message-loaded", G_CALLBACK(mcv_scroll_to_mmv), mcv);
 		}
 
 		if (!unread && i == array->len -1) {
-				unread = mail_message_view_get_focus_widget(child);
+				unread = mail_message_view_get_focus_widget((MailMessageView *)child);
 				g_signal_connect (child, "message-loaded", G_CALLBACK(mcv_scroll_to_mmv), mcv);
-				mail_message_view_show_message (child);
+				mail_message_view_show_message ((MailMessageView *)child);
 		}
 	}
 
@@ -401,7 +399,7 @@ mcv_scroll_key_press (GtkWidget *w, GdkEventKey *event, MailConvView *mcv)
 	case GDK_KP_Home:
 	case GDK_End:	
 	case GDK_KP_End:	
-		mcv_key_press (mcv, event);
+		mcv_key_press ((GtkWidget *)mcv, event);
 		return TRUE;
 	default:
 		break;
@@ -413,8 +411,6 @@ void
 mail_conv_view_construct (MailConvView *mcview)
 {
 	MailConvViewPrivate *priv = mcview->priv;
-	MailMessageView *preview;
-	GtkWidget *tmp;
 	
 	mcview->child_box = NULL;
 
@@ -427,11 +423,11 @@ mail_conv_view_construct (MailConvView *mcview)
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mcview->scroller),
 			GTK_POLICY_AUTOMATIC,
 			GTK_POLICY_AUTOMATIC);
-	priv->viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment(mcview->scroller), gtk_scrolled_window_get_vadjustment(mcview->scroller));
-	gtk_viewport_set_shadow_type (priv->viewport, GTK_SHADOW_NONE);
-	gtk_container_add (mcview->scroller, priv->viewport);
+	priv->viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)mcview->scroller), gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)mcview->scroller));
+	gtk_viewport_set_shadow_type ((GtkViewport *)priv->viewport, GTK_SHADOW_NONE);
+	gtk_container_add ((GtkContainer *)mcview->scroller, priv->viewport);
 	gtk_widget_show (priv->viewport);
-	gtk_box_pack_start (mcview, mcview->scroller, TRUE, TRUE, 0);
+	gtk_box_pack_start ((GtkBox *)mcview, mcview->scroller, TRUE, TRUE, 0);
 	gtk_widget_show (mcview->scroller);
 
 		
@@ -460,10 +456,8 @@ mail_conv_view_activate (MailConvView *mcv, GtkWidget *tree, GtkWidget *folder_t
 static gboolean
 mcv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailConvView *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);
@@ -488,26 +482,26 @@ mail_conv_view_get_tab_widget(MailConvView *mcv)
 	GtkWidget *tab_label;
 
 	img = gtk_image_new_from_pixbuf (pbuf);
-	g_object_set_data (img, "pbuf", pbuf);
-	g_signal_connect (img, "expose-event", mcv_btn_expose, mcv);
+	g_object_set_data ((GObject *)img, "pbuf", pbuf);
+	g_signal_connect (img, "expose-event", G_CALLBACK(mcv_btn_expose), mcv);
 	
 	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(mcv_close), mcv);
 	
 	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);
 
 	box = gtk_label_new (_("Message"));
 	tab_label = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (tab_label, box, FALSE, FALSE, 0);
-	gtk_box_pack_start (tab_label, tool, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0);
 	gtk_widget_show_all (tab_label);
 
 	return tab_label;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]