[Osmo-pim-svn] SF.net SVN: osmo-pim: [444] trunk/src/check_events.c

[<pa...@us...>]

Revision: 444
          http://osmo-pim.svn.sourceforge.net/osmo-pim/?rev=444&view=rev
Author:   pasp
Date:     2008-05-31 10:08:39 -0700 (Sat, 31 May 2008)

Log Message:
-----------
* Fixed crash

Modified Paths:
--------------
    trunk/src/check_events.c

Modified: trunk/src/check_events.c
===================================================================
--- trunk/src/check_events.c	2008-05-31 16:16:27 UTC (rev 443)
+++ trunk/src/check_events.c	2008-05-31 17:08:39 UTC (rev 444)
@@ -111,7 +111,7 @@
 		}
 	}
 
-	/* FIXME + month_interval + day of week */
+	/* FIXME: month_interval + day of week */
 	if (flag == TRUE) {
 		*new_date = item->due_date_julian + item->repeat_day_interval;
 	}
@@ -121,7 +121,7 @@
 /*------------------------------------------------------------------------------*/
 
 void
-tsk_done_callback (NotifyNotification *n, const char *action, gpointer user_data)
+tsk_done_cb (NotifyNotification *n, const char *action, gpointer user_data)
 {
 GtkTreeIter *iter;
 GSList *tnode;
@@ -182,7 +182,7 @@
 /*------------------------------------------------------------------------------*/
 
 void
-tsk_postpone_callback (NotifyNotification *n, const char *action, gpointer user_data)
+tsk_postpone_cb (NotifyNotification *n, const char *action, gpointer user_data)
 {
 GtkTreeIter *iter;
 GSList *tnode;
@@ -218,8 +218,8 @@
 
 /*------------------------------------------------------------------------------*/
 
-void /* FIXME + sort path + filter path*/
-tsk_show_callback (NotifyNotification *n, const char *action, gpointer user_data)
+void 
+tsk_show_task_cb (NotifyNotification *n, const char *action, gpointer user_data)
 {
 GtkTreeIter *iter;
 GSList *tnode;
@@ -230,13 +230,16 @@
 	GUI *appGUI = (GUI *)user_data;
 
 	for (i = 0, tnode = appGUI->tsk->notifications; tnode != NULL; tnode = tnode->next, i++) {
-		a = g_slist_nth_data (appGUI->tsk->notifications, i);
-		if (a->notify == n) {
-			iter = task_get_iter (a->id, appGUI);
 
-			if (iter != NULL) {
+        a = g_slist_nth_data (appGUI->tsk->notifications, i);
+
+        if (a->notify == n) {
+
+            iter = task_get_iter (a->id, appGUI);
+
+			if (iter != NULL) {     /* FIXME */
+                /*gtk_tree_selection_select_iter (GTK_TREE_SELECTION(appGUI->tsk->tasks_list_selection), iter);*/
 				path = gtk_tree_model_get_path (GTK_TREE_MODEL (appGUI->tsk->tasks_list_store), iter);
-
 				if (path != NULL) {
 					gtk_tree_view_set_cursor (GTK_TREE_VIEW (appGUI->tsk->tasks_list), path, NULL, FALSE);
 					gtk_tree_path_free (path);
@@ -244,7 +247,6 @@
 			} else {
 				tsk_show_info_dialog (appGUI);
 			}
-
 			break;
 		}
 	}
@@ -367,9 +369,11 @@
 
 				if (tsk_show_task_notification (item, &iter, appGUI) == TRUE) {
 
-					if (strlen (item->alarm_command)) {
-						gui_save_data_and_run_command (item->alarm_command, appGUI);
-					}
+                    if (item->alarm_command != NULL) {
+                        if (strlen (item->alarm_command)) {
+                            gui_save_data_and_run_command (item->alarm_command, appGUI);
+                        }
+                    }
 
 					sprintf (tmpbuf2, "<i>%s</i>", get_date_time_full_str (item->due_date_julian, item->due_time));
 					strncpy (tmpbuf, tmpbuf2, BUFFER_SIZE);
@@ -393,13 +397,13 @@
 						case 2: notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_CRITICAL); break;
 					}
 					if (item->due_time != -1) {
-						notify_notification_add_action (a->notify, "postpone", "Postpone",
-						                                (NotifyActionCallback)tsk_postpone_callback, appGUI, NULL);
+						notify_notification_add_action (a->notify, "postpone", _("Postpone"),
+						                                (NotifyActionCallback)tsk_postpone_cb, appGUI, NULL);
 					}
-					notify_notification_add_action (a->notify, "show_task", "Show task",
-					                                (NotifyActionCallback)tsk_show_callback, appGUI, NULL);
-					notify_notification_add_action (a->notify, "done", "Done",
-					                                (NotifyActionCallback)tsk_done_callback, appGUI, NULL);
+					notify_notification_add_action (a->notify, "show_task", _("Show task"),
+					                                (NotifyActionCallback)tsk_show_task_cb, appGUI, NULL);
+					notify_notification_add_action (a->notify, "done", _("Done"),
+					                                (NotifyActionCallback)tsk_done_cb, appGUI, NULL);
 
 					if (!notify_notification_show (a->notify, NULL)) {
 						g_warning ("Failed to send notification");
@@ -432,8 +436,8 @@
 
 					notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
 					notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
-					notify_notification_add_action (a->notify, "show_task", "Show task",
-					                                (NotifyActionCallback)tsk_show_callback, appGUI, NULL);
+					notify_notification_add_action (a->notify, "show_task", _("Show task"),
+					                                (NotifyActionCallback)tsk_show_task_cb, appGUI, NULL);
 
 					if (!notify_notification_show (a->notify, NULL)) {
 						g_warning ("Failed to send notification");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.