Author: juha
Date: 2008-08-22 12:43:05 +0000 (Fri, 22 Aug 2008)
New Revision: 27540
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/globaltime/globaltime.c
xfcalendar/trunk/globaltime/gt_prefs.c
xfcalendar/trunk/libical/src/libical/icalrecur.c
xfcalendar/trunk/libical/src/libical/icaltime.c
xfcalendar/trunk/panel-plugin/orageclock.c
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/day-view.c
xfcalendar/trunk/src/ical-code.c
Log:
4.5.14.4:
Fixed several errors when running with --enable-debug=full
Modified: xfcalendar/trunk/configure.in.in
===================================================================
--- xfcalendar/trunk/configure.in.in 2008-08-22 12:18:42 UTC (rev 27539)
+++ xfcalendar/trunk/configure.in.in 2008-08-22 12:43:05 UTC (rev 27540)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.14.3-svn])
+m4_define([orage_version], [4.5.14.4-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/globaltime/globaltime.c
===================================================================
--- xfcalendar/trunk/globaltime/globaltime.c 2008-08-22 12:18:42 UTC (rev
27539)
+++ xfcalendar/trunk/globaltime/globaltime.c 2008-08-22 12:43:05 UTC (rev
27540)
@@ -106,7 +106,7 @@
return(FALSE);
}
-static show_globaltime()
+static void show_globaltime()
{
GdkWindow *window;
Modified: xfcalendar/trunk/globaltime/gt_prefs.c
===================================================================
--- xfcalendar/trunk/globaltime/gt_prefs.c 2008-08-22 12:18:42 UTC (rev
27539)
+++ xfcalendar/trunk/globaltime/gt_prefs.c 2008-08-22 12:43:05 UTC (rev
27540)
@@ -326,7 +326,7 @@
static void move_clock(GtkWidget *widget, modify_struct *modify_clock)
{
clock_struct *clockp = modify_clock->clock;
- gint pos, new_pos, len;
+ gint pos, new_pos = 0, len;
const gchar *button_text;
if ((len = g_list_length(clocks.clock_list)) == 1)
@@ -359,7 +359,6 @@
static void ask_timezone(GtkWidget *widget, modify_struct *modify_clock)
{
- clock_struct *clockp = modify_clock->clock;
GtkWidget *dialog;
gchar *filename = NULL;
gchar *clockname = NULL;
@@ -378,7 +377,7 @@
gtk_entry_set_text(GTK_ENTRY(modify_clock->tz_entry), filename);
if (strlen(gtk_entry_get_text(GTK_ENTRY(modify_clock->name_entry)))
== 0) {
- if (clockname = strrchr(filename, (int)'/'))
+ if ((clockname = strrchr(filename, (int)'/')))
gtk_entry_set_text(GTK_ENTRY(modify_clock->name_entry)
, clockname+1);
else
Modified: xfcalendar/trunk/libical/src/libical/icalrecur.c
===================================================================
--- xfcalendar/trunk/libical/src/libical/icalrecur.c 2008-08-22 12:18:42 UTC
(rev 27539)
+++ xfcalendar/trunk/libical/src/libical/icalrecur.c 2008-08-22 12:43:05 UTC
(rev 27540)
@@ -744,6 +744,7 @@
return passes;
}
+/*
static int count_byrules(icalrecur_iterator* impl)
{
int count = 0;
@@ -757,6 +758,7 @@
return count;
}
+*/
static void setup_defaults(icalrecur_iterator* impl,
@@ -992,7 +994,7 @@
/* If this is a monthly interval with by day data, then we need to
set the last value to the appropriate day of the month */
- if(impl->rule.freq == ICAL_MONTHLY_RECURRENCE)
+ if(impl->rule.freq == ICAL_MONTHLY_RECURRENCE) {
if (has_by_data(impl,BY_DAY)) {
int dow = icalrecurrencetype_day_day_of_week(
@@ -1043,6 +1045,7 @@
} else if (has_by_data(impl,BY_MONTH_DAY)) {
impl->last = icaltime_normalize(impl->last);
}
+ }
@@ -1374,6 +1377,7 @@
}
+/*
static int next_yearday(icalrecur_iterator* impl)
{
@@ -1406,6 +1410,7 @@
return end_of_data;
}
+*/
/* Returns the day of the month for the current month of t that is the
Modified: xfcalendar/trunk/libical/src/libical/icaltime.c
===================================================================
--- xfcalendar/trunk/libical/src/libical/icaltime.c 2008-08-22 12:18:42 UTC
(rev 27539)
+++ xfcalendar/trunk/libical/src/libical/icaltime.c 2008-08-22 12:43:05 UTC
(rev 27540)
@@ -829,10 +829,12 @@
tt->hour = 0;
}
-IS_DATE:
/* Normalize the month. We do this before handling the day since we may
need to know what month it is to get the number of days in it.
Note that months are 1 to 12, so we have to be a bit careful. */
+ /*
+IS_DATE:
+ */
if (tt->month >= 13) {
years_overflow = (tt->month - 1) / 12;
tt->year += years_overflow;
Modified: xfcalendar/trunk/panel-plugin/orageclock.c
===================================================================
--- xfcalendar/trunk/panel-plugin/orageclock.c 2008-08-22 12:18:42 UTC (rev
27539)
+++ xfcalendar/trunk/panel-plugin/orageclock.c 2008-08-22 12:43:05 UTC (rev
27540)
@@ -159,7 +159,7 @@
return(TRUE);
}
-static gboolean oc_end_tuning(Clock *clock)
+static void oc_end_tuning(Clock *clock)
{
/* if we have longer than 1 sec timer, we need to reschedule
* it regularly since it will fall down slowly but surely */
@@ -247,11 +247,12 @@
default:
break;
}
- if (continue_tuning)
+ if (continue_tuning) {
if (tune->cnt == 3)
continue_tuning = oc_next_level_tuning(clock);
else
tune->cnt++;
+ }
return(continue_tuning);
}
@@ -490,7 +491,7 @@
}
}
- if (ret = xfce_rc_read_entry(rc, "tooltip", NULL))
+ if ((ret = xfce_rc_read_entry(rc, "tooltip", NULL)))
g_string_assign(clock->tooltip_data, ret);
xfce_rc_close(rc);
Modified: xfcalendar/trunk/src/appointment.c
===================================================================
--- xfcalendar/trunk/src/appointment.c 2008-08-22 12:18:42 UTC (rev 27539)
+++ xfcalendar/trunk/src/appointment.c 2008-08-22 12:43:05 UTC (rev 27540)
@@ -760,7 +760,7 @@
}
}
-static gboolean fill_appt_from_apptw_alarm(xfical_appt *appt, appt_win *apptw)
+static void fill_appt_from_apptw_alarm(xfical_appt *appt, appt_win *apptw)
{
gint i, j, k;
gchar *tmp;
@@ -1514,8 +1514,10 @@
if (color) {
cat = g_new(orage_category_struct, 1);
cat->category = g_strdup(cat_groups[i]);
- sscanf(color, ORAGE_COLOR_FORMAT, &(cat->color.red)
- , &(cat->color.green), &(cat->color.blue));
+ sscanf(color, ORAGE_COLOR_FORMAT
+ , (unsigned int *)&(cat->color.red)
+ , (unsigned int *)&(cat->color.green)
+ , (unsigned int *)&(cat->color.blue));
gdk_colormap_alloc_color(pic1_cmap, &cat->color, FALSE, TRUE);
orage_category_list = g_list_prepend(orage_category_list, cat);
g_free(color);
@@ -1658,7 +1660,6 @@
static void cat_color_button_changed(GtkColorButton *color_button
, gpointer user_data)
{
- category_win_struct *catw = (category_win_struct *)user_data;
gchar *category;
GdkColor color;
Modified: xfcalendar/trunk/src/day-view.c
===================================================================
--- xfcalendar/trunk/src/day-view.c 2008-08-22 12:18:42 UTC (rev 27539)
+++ xfcalendar/trunk/src/day-view.c 2008-08-22 12:43:05 UTC (rev 27540)
@@ -807,7 +807,7 @@
gint days; /* number of days to show */
int year, month, day;
gint i, sunday;
- GtkWidget *label, *button, *arrow;
+ GtkWidget *label, *button;
char text[5+1], *date, *today;
struct tm tm_date;
guint monthdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
Modified: xfcalendar/trunk/src/ical-code.c
===================================================================
--- xfcalendar/trunk/src/ical-code.c 2008-08-22 12:18:42 UTC (rev 27539)
+++ xfcalendar/trunk/src/ical-code.c 2008-08-22 12:43:05 UTC (rev 27540)
@@ -904,7 +904,7 @@
#ifdef ORAGE_DEBUG
orage_message(-300, P_N);
#endif
- if (itime_tz = icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER))
+ if ((itime_tz = icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)))
tz_loc = (char *)icalparameter_get_tzid(itime_tz);
return(tz_loc);
}
@@ -949,7 +949,7 @@
#ifdef ORAGE_DEBUG
orage_message(-300, P_N);
#endif
- if (tz_loc = get_char_timezone(p)) {
+ if ((tz_loc = get_char_timezone(p))) {
/* FIXME: could we now call convert_to_zone or is it a problem
* if we always move to zone format ? */
if (!(l_icaltimezone = get_builtin_timezone(tz_loc))) {
@@ -2513,7 +2513,7 @@
#ifdef ORAGE_DEBUG
orage_message(-200, P_N);
#endif
- if (appt = xfical_appt_get_internal(ical_uid, base)) {
+ if ((appt = xfical_appt_get_internal(ical_uid, base))) {
xfical_appt_get_fill_internal(appt, file_type);
}
return(appt);
@@ -3826,7 +3826,7 @@
#undef P_N
#define P_N "pre_format: "
gchar *text, *tmp, *tmp2, *tmp3;
- gsize text_len, i;
+ gsize text_len;
GError *error = NULL;
#ifdef ORAGE_DEBUG
@@ -4229,7 +4229,7 @@
#undef P_N
#define P_N "xfical_appt_get_next_with_string_internal: "
static gchar *text_upper, *text, *beg, *end;
- static upper_text;
+ static gboolean upper_text;
gchar *cur, *tmp, mem;
gsize text_len, len;
char *uid, ical_uid[XFICAL_UID_LEN+1];
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
