Author: juha
Date: 2008-04-21 20:49:01 +0000 (Mon, 21 Apr 2008)
New Revision: 26881
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/reminder.c
Log:
minor changes from a trial version.
Modified: xfcalendar/trunk/src/appointment.c
===================================================================
--- xfcalendar/trunk/src/appointment.c 2008-04-21 19:46:12 UTC (rev 26880)
+++ xfcalendar/trunk/src/appointment.c 2008-04-21 20:49:01 UTC (rev 26881)
@@ -1438,6 +1438,14 @@
/* categories start. */
/************************************************************/
+typedef struct _orage_category
+{
+ gchar *category;
+ GdkColor color;
+} orage_category_struct;
+
+GList *orage_category_list = NULL;
+
static OrageRc *orage_category_file_open(gboolean read_only)
{
gchar *fpath;
@@ -1452,15 +1460,6 @@
return(orc);
}
-typedef struct _orage_category
-{
- gchar *category;
- GdkColor color;
-} orage_category_struct;
-
-
-GList *orage_category_list = NULL;
-
GdkColor *orage_category_list_contains(char *categories)
{
GList *cat_l;
@@ -1616,7 +1615,7 @@
OrageRc *orc;
if (!ORAGE_STR_EXISTS(category)) {
- orage_message(50, "orage_category_write_entry: empty category. Not
removed");
+ orage_message(50, "orage_category_remove_entry: empty category. Not
removed");
return;
}
orc = orage_category_file_open(FALSE);
Modified: xfcalendar/trunk/src/main.c
===================================================================
--- xfcalendar/trunk/src/main.c 2008-04-21 19:46:12 UTC (rev 26880)
+++ xfcalendar/trunk/src/main.c 2008-04-21 20:49:01 UTC (rev 26881)
@@ -481,7 +481,7 @@
/* start monitoring foreign file updates if we have foreign files */
if (g_par.foreign_count)
- g_timeout_add(30*1000, (GtkFunction) orage_foreign_files_check, NULL);
+ g_timeout_add(30*1000, (GtkFunction)orage_foreign_files_check, NULL);
/* let's check if I got filename as a parameter */
initialized = TRUE;
Modified: xfcalendar/trunk/src/reminder.c
===================================================================
--- xfcalendar/trunk/src/reminder.c 2008-04-21 19:46:12 UTC (rev 26880)
+++ xfcalendar/trunk/src/reminder.c 2008-04-21 20:49:01 UTC (rev 26881)
@@ -423,7 +423,8 @@
}
strncpy(heading, _("Reminder "), 199);
- strncat(heading, alarm->title, 50);
+ if (alarm->title)
+ g_strlcat(heading, alarm->title, 50);
n = notify_notification_new(heading, alarm->description, NULL, NULL);
alarm->active_alarm->active_notify = n;
if (g_par.trayIcon
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
