Re: [evolution-patches] Cleanups for evolution/widgets/misc

[Kjartan Maraas <kmaraas broadpark no>]

tir, 29,.08.2006 kl. 22.37 +0200, skrev Kjartan Maraas:
> Same as before and add a check for a null esb in set_option. This showed
> up in some valgrind runs I did as "use of uninitialized variable".

Another rediff against current CVS.

Cheers
Kjartan


? warnings
Index: e-filter-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-filter-bar.c,v
retrieving revision 1.57
diff -r1.57 e-filter-bar.c
109,110c109
< 	/* the below generates a compiler warning about incompatible pointer types */
< 	ESearchBar *esb = efb;
---
> 	ESearchBar *esb = (ESearchBar *)efb;
242c241
< 	GtkWidget *dialog, *w;
---
> 	GtkWidget *dialog;
467c466
< 	int i, j;
---
> 	int i;
864c863
< 	ESearchBarItem item = { NULL, -1, NULL };
---
> 	ESearchBarItem item = { NULL, -1, 0 };
Index: e-icon-entry.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-icon-entry.c,v
retrieving revision 1.4
diff -r1.4 e-icon-entry.c
337d336
< 	GtkWidget *box;
374c373
< 	gtk_event_box_set_visible_window ((eventbox), FALSE);
---
> 	gtk_event_box_set_visible_window (GTK_EVENT_BOX (eventbox), FALSE);
379,380c378,379
< 	g_signal_connect_after (eventbox, "enter-notify-event", set_cursor, NULL);
< 	g_signal_connect_after (eventbox, "leave-notify-event", set_cursor, NULL);
---
> 	g_signal_connect_after (eventbox, "enter-notify-event", G_CALLBACK (set_cursor), NULL);
> 	g_signal_connect_after (eventbox, "leave-notify-event", G_CALLBACK (set_cursor), NULL);
Index: e-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-search-bar.c,v
retrieving revision 1.109
diff -r1.109 e-search-bar.c
305c305
< 		text = g_object_get_data (gtk_menu_get_active ( GTK_MENU (esb->scopeoption_menu)),"string");
---
> 		text = g_object_get_data (G_OBJECT (gtk_menu_get_active ( GTK_MENU (esb->scopeoption_menu))), "string");
451c451
< 	char *text;
---
> 	const gchar *text;
503d502
< 	GtkStyle *style = gtk_widget_get_default_style ();
513a513
> #if 0
529a530
> #endif
661c662
< 	if (esb->option_menu) 
---
> 	if (esb && esb->option_menu) 
708c709
< 	g_object_set_data (esb->option_menu, "group", group);
---
> 	g_object_set_data (G_OBJECT (esb->option_menu), "group", group);
954c955
< 	g_signal_connect (G_OBJECT (search_bar->clear_button), "button-press-event", clear_button_clicked_cb, search_bar);
---
> 	g_signal_connect (G_OBJECT (search_bar->clear_button), "button-press-event", G_CALLBACK (clear_button_clicked_cb), search_bar);
958c959
< 	g_signal_connect (G_OBJECT (search_bar->option_button), "button-press-event", option_button_clicked_cb, search_bar);
---
> 	g_signal_connect (G_OBJECT (search_bar->option_button), "button-press-event", G_CALLBACK (option_button_clicked_cb), search_bar);
976c977
< 	gtk_label_set_mnemonic_widget (label, search_bar->viewoption);
---
> 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), search_bar->viewoption);
993c994
< 	gtk_label_set_mnemonic_widget (label, search_bar->entry);
---
> 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), search_bar->entry);
1005c1006
< 	g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar);
---
> 	g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", G_CALLBACK (scopeoption_changed_cb), search_bar);
1009c1010
< 	gtk_label_set_mnemonic_widget (label, search_bar->scopeoption);
---
> 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), search_bar->scopeoption);
1336c1337
< 	gtk_menu_set_active (search_bar->option_menu, row);
---
> 	gtk_menu_set_active (GTK_MENU (search_bar->option_menu), row);