Author: juha
Date: 2008-02-02 00:42:52 + (Sat, 02 Feb 2008)
New Revision: 26593
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/panel-plugin/orageclock.c
xfcalendar/trunk/src/mainbox.c
Log:
Fixed Bug 3829 - GLib-Critical on g_source_remove in orageclock
Fixed also
Gtk-CRITICAL **: calendar_invalidate_day_num: assertion `row != -1' failed
which could happen when changing month in Orage main window.
Release 4.5.12.3
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-02-01 13:46:37 UTC (rev 26592)
+++ xfcalendar/trunk/configure.in.in2008-02-02 00:42:52 UTC (rev 26593)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.12.2-svn])
+m4_define([orage_version], [4.5.12.3-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/panel-plugin/orageclock.c
===
--- xfcalendar/trunk/panel-plugin/orageclock.c 2008-02-01 13:46:37 UTC (rev
26592)
+++ xfcalendar/trunk/panel-plugin/orageclock.c 2008-02-02 00:42:52 UTC (rev
26593)
@@ -386,7 +386,9 @@
if (dlg)
gtk_widget_destroy(dlg);
-g_source_remove(clock-timeout_id);
+if (clock-timeout_id) {
+g_source_remove(clock-timeout_id);
+}
g_object_unref(clock-tips);
g_object_unref(clock-line[0].label);
g_object_unref(clock-line[1].label);
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2008-02-01 13:46:37 UTC (rev 26592)
+++ xfcalendar/trunk/src/mainbox.c 2008-02-02 00:42:52 UTC (rev 26593)
@@ -51,9 +51,18 @@
#include tray_icon.h
#include day-view.h
+/*
+#define ORAGE_DEBUG 1
+*/
+
gboolean orage_mark_appointments()
{
+#undef P_N
+#define P_N orage_mark_appointments:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
if (!xfical_file_open(TRUE))
return(FALSE);
xfical_mark_calendar(GTK_CALENDAR(g_par.xfcal-mCalendar));
@@ -63,9 +72,14 @@
static void mFile_newApp_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
+#define P_N mFile_newApp_activate_cb:
struct tm *t;
char cur_date[9];
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
t = orage_localtime();
g_snprintf(cur_date, 9, %04d%02d%02d, t-tm_year+1900
, t-tm_mon+1, t-tm_mday);
@@ -75,55 +89,95 @@
static void mFile_interface_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mFile_interface_activate_cb:
CalWin *cal = (CalWin *)user_data;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
orage_external_interface(cal);
}
static void mFile_close_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
+#define P_N mFile_close_activate_cb:
CalWin *cal = (CalWin *)user_data;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
gtk_widget_hide(cal-mWindow);
}
static void mFile_quit_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
+#define P_N mFile_quit_activate_cb:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
gtk_main_quit();
}
static void mEdit_preferences_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mEdit_preferences_activate_cb:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
show_parameters();
}
static void mView_ViewSelectedDate_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mView_ViewSelectedDate_activate_cb:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
create_el_win(NULL);
}
static void mView_ViewSelectedWeek_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mView_ViewSelectedWeek_activate_cb:
CalWin *cal = (CalWin *)user_data;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
create_day_win(orage_cal_to_i18_date(GTK_CALENDAR(cal-mCalendar)));
}
static void mView_selectToday_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mView_selectToday_activate_cb:
CalWin *cal = (CalWin *)user_data;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
orage_select_today(GTK_CALENDAR(cal-mCalendar));
}
static void mHelp_help_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
+#define P_N mHelp_help_activate_cb:
gchar *helpdoc;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
helpdoc = g_strconcat(xfbrowser4 , PACKAGE_DATA_DIR
, G_DIR_SEPARATOR_S, orage
, G_DIR_SEPARATOR_S, doc
@@ -134,38 +188,22 @@
static void mHelp_about_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
