Warning fixes: - NULL vs 0 vs FALSE/TRUE - ANSIfication of declarations -

2007-10-23  Kjartan Maraas  <kmaraas@gnome.org>

	* gui/alarm-notify/alarm-notify-dialog.c:
	* gui/alarm-notify/alarm-notify.c: 
	* gui/alarm-notify/alarm-queue.c:
	* gui/alarm-notify/config-data.c:
	* gui/cal-search-bar.c: 
	* gui/calendar-commands.c:
	* gui/calendar-config.c: 
	* gui/dialogs/alarm-dialog.c: 
	* gui/dialogs/alarm-list-dialog.c: 
	* gui/dialogs/cal-prefs-dialog.c: 
	* gui/dialogs/comp-editor.c: 
	* gui/dialogs/event-page.c: 
	* gui/dialogs/recurrence-page.c: 
	* gui/e-alarm-list.c: 
	* gui/e-cal-config.c:
	* gui/e-cal-event.c: 
	* gui/e-cal-menu.c:
	* gui/e-cal-popup.c: 
	* gui/e-calendar-table.c: 
	* gui/e-calendar-view.c:
	* gui/e-date-time-list.c:
	* gui/e-day-view-main-item.c:
	* gui/e-day-view-time-item.c:
	* gui/e-day-view.c: 
	* gui/e-itip-control.c: 
	* gui/e-meeting-list-view.c: 
	* gui/e-memo-table.c:
	* gui/e-select-names-editable.c: 
	* gui/e-week-view-event-item.c: 
	* gui/e-week-view.c: 
	* gui/goto.c:
	* gui/migration.c: 
	* gui/print.c: 
	* gui/tasks-control.c: 
	* importers/icalendar-importer.c: 

	Warning fixes:
	- NULL vs 0 vs FALSE/TRUE
	- ANSIfication of declarations
	- mixing declarations and code
	- mark some code static
	- remove use of some deprecated Gtk+ apis

svn path=/trunk/; revision=34420

1 files changed, 3 insertions, 7 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 90db23060d..eab6b95606 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -99,10 +99,6 @@ edit_pressed_cb (GtkButton *button, gpointer user_data);
 static void
 snooze_pressed_cb (GtkButton *button, gpointer user_data);
 
-AlarmNotify *an = NULL;
-gboolean have_one = FALSE;
-
-
 static void
 an_update_minutes_label (GtkSpinButton *sb, gpointer data)
 {
@@ -147,9 +143,9 @@ dialog_response_cb (GtkDialog *dialog, guint response_id, gpointer user_data)
 	}
 
 	if (!funcinfo) {
-		GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (an->treeview));
-		gtk_tree_model_get_iter_first (model, &iter);
-		gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);
+		GtkTreeModel *treemodel = gtk_tree_view_get_model (GTK_TREE_VIEW (an->treeview));
+		gtk_tree_model_get_iter_first (treemodel, &iter);
+		gtk_tree_model_get (treemodel, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);
 	}
 	g_return_if_fail (funcinfo);
 	switch (response_id) {