[Xfce4-commits] <orage:master> 4.7.6.9: fixes from --enable-debug=full
Juha Kautto
noreply at xfce.org
Thu Dec 16 22:30:03 CET 2010
Updating branch refs/heads/master
to 288f617f32a047f1b645ed9c31c2341091cf18b3 (commit)
from e94ce125a38eae7e68bd0e3b11a8d103765fd436 (commit)
commit 288f617f32a047f1b645ed9c31c2341091cf18b3
Author: Juha Kautto <juha at xfce.org>
Date: Thu Dec 16 23:26:33 2010 +0200
4.7.6.9: fixes from --enable-debug=full
Fixed warnings from --enable-debug=full. Except libical part as there is so
many and it basically will go away when external libical works.
configure.in.in | 2 +-
globaltime/globaltime.c | 10 +-
globaltime/gt_prefs.c | 5 +-
globaltime/timezone_selection.c | 2 +-
src/about-xfcalendar.c | 3 +-
src/appointment.c | 24 ++--
src/day-view.c | 2 +-
src/event-list.c | 38 ++--
src/functions.c | 6 +-
src/functions.h | 3 +
src/ical-archive.c | 20 +--
src/ical-code.c | 68 ++++----
src/interface.c | 92 +++++-----
src/interface.h | 1 +
src/main.c | 20 +--
src/mainbox.c | 17 +-
src/orage-dbus-client.c | 1 +
src/orage-dbus-object.c | 18 +-
src/orage-dbus-object.h | 2 +
src/parameters.c | 45 +++---
src/reminder.c | 359 +++++++++++++++++++--------------------
src/timezone_selection.c | 2 +-
src/tray_icon.c | 27 ++--
src/tz_zoneinfo_read.c | 48 +++---
24 files changed, 395 insertions(+), 420 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 226a8c5..3ed04b9 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.7.6.8-git])
+m4_define([orage_version], [4.7.6.9-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/globaltime/globaltime.c b/globaltime/globaltime.c
index 8218d19..a78aa75 100644
--- a/globaltime/globaltime.c
+++ b/globaltime/globaltime.c
@@ -106,7 +106,7 @@ static gboolean global_time_active_already(GdkAtom *atom)
return(FALSE);
}
-static void raise_window()
+static void raise_window(void)
{
GdkWindow *window;
@@ -390,7 +390,7 @@ static void add_default_clock(void)
write_file();
}
-void upd_clock(clock_struct *clockp)
+static void upd_clock(clock_struct *clockp)
{
struct tm *now;
@@ -435,12 +435,12 @@ static gboolean upd_clocks(void)
return(TRUE);
}
-void adj_hh_changed(GtkSpinButton *cb, gpointer user_data)
+static void adj_hh_changed(GtkSpinButton *cb, gpointer user_data)
{
clocks.hh_adj = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(cb));
}
-void adj_mm_changed(GtkSpinButton *cb, gpointer user_data)
+static void adj_mm_changed(GtkSpinButton *cb, gpointer user_data)
{
clocks.mm_adj = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(cb));
}
@@ -508,7 +508,7 @@ static gboolean clean_up(GtkObject *obj, GdkEvent *event, gint g)
return(FALSE);
}
-static void initialize_clocks()
+static void initialize_clocks(void)
{
GtkWidget *button;
diff --git a/globaltime/gt_prefs.c b/globaltime/gt_prefs.c
index 6c83559..b8137e6 100644
--- a/globaltime/gt_prefs.c
+++ b/globaltime/gt_prefs.c
@@ -154,8 +154,9 @@ static void add_header(GtkWidget *box, gchar *text, gboolean bold)
gtk_widget_show(label);
}
-GtkWidget *toolbar_append_button(GtkWidget *toolbar, const gchar *stock_id
- , GtkTooltips *tooltips, const char *tooltip_text)
+static GtkWidget *toolbar_append_button(GtkWidget *toolbar
+ , const gchar *stock_id, GtkTooltips *tooltips
+ , const char *tooltip_text)
{
GtkWidget *button;
diff --git a/globaltime/timezone_selection.c b/globaltime/timezone_selection.c
index 3bb88bc..e320ac6 100644
--- a/globaltime/timezone_selection.c
+++ b/globaltime/timezone_selection.c
@@ -225,7 +225,7 @@ static gint sortEvent_comp(GtkTreeModel *model
return(ret);
}
-GtkWidget *tz_button_create_view(gboolean details, GtkTreeStore *store)
+static GtkWidget *tz_button_create_view(gboolean details, GtkTreeStore *store)
{
#undef P_N
#define P_N "tz_button_create_view: "
diff --git a/src/about-xfcalendar.c b/src/about-xfcalendar.c
index 58a36e1..c1b705e 100644
--- a/src/about-xfcalendar.c
+++ b/src/about-xfcalendar.c
@@ -28,13 +28,12 @@
#include <gtk/gtk.h>
#include "orage-i18n.h"
-#include "mainbox.h"
#include "tray_icon.h"
+#include "about-xfcalendar.h"
void create_wAbout(GtkWidget *widget, gpointer user_data)
{
- CalWin *xfcal = (CalWin *)user_data;
GtkWidget *dialog;
GdkPixbuf *orage_logo;
GtkAboutDialog *about;
diff --git a/src/appointment.c b/src/appointment.c
index 58f3348..603f223 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -565,7 +565,7 @@ static void on_appNote_buffer_changed_cb(GtkTextBuffer *b, gpointer user_data)
appt_win *apptw = (appt_win *)user_data;
GtkTextIter start, end, match_start, match_end;
GtkTextBuffer *tb;
- gchar *cdate, ctime[6], *cdatetime;
+ gchar *cdate, c_time[6], *cdatetime;
struct tm *tm;
tb = apptw->Note_buffer;
@@ -581,17 +581,17 @@ static void on_appNote_buffer_changed_cb(GtkTextBuffer *b, gpointer user_data)
, GTK_TEXT_SEARCH_TEXT_ONLY
, &match_start, &match_end, &end)) { /* found it */
tm = orage_localtime();
- g_sprintf(ctime, "%02d:%02d", tm->tm_hour, tm->tm_min);
+ g_sprintf(c_time, "%02d:%02d", tm->tm_hour, tm->tm_min);
gtk_text_buffer_delete(tb, &match_start, &match_end);
- gtk_text_buffer_insert(tb, &match_start, ctime, -1);
+ gtk_text_buffer_insert(tb, &match_start, c_time, -1);
}
else if (gtk_text_iter_forward_search(&start, "<DT>"
, GTK_TEXT_SEARCH_TEXT_ONLY
, &match_start, &match_end, &end)) { /* found it */
tm = orage_localtime();
cdate = orage_tm_date_to_i18_date(tm);
- g_sprintf(ctime, "%02d:%02d", tm->tm_hour, tm->tm_min);
- cdatetime = g_strconcat(cdate, " ", ctime, NULL);
+ g_sprintf(c_time, "%02d:%02d", tm->tm_hour, tm->tm_min);
+ cdatetime = g_strconcat(cdate, " ", c_time, NULL);
gtk_text_buffer_delete(tb, &match_start, &match_end);
gtk_text_buffer_insert(tb, &match_start, cdatetime, -1);
g_free(cdatetime);
@@ -1705,14 +1705,14 @@ static void orage_category_free(gpointer gcat, gpointer dummy)
g_free(cat);
}
-void orage_category_free_list()
+static void orage_category_free_list(void)
{
g_list_foreach(orage_category_list, orage_category_free, NULL);
g_list_free(orage_category_list);
orage_category_list = NULL;
}
-void orage_category_get_list()
+void orage_category_get_list(void)
{
OrageRc *orc;
gchar **cat_groups, *color;
@@ -1751,7 +1751,7 @@ void orage_category_get_list()
orage_rc_file_close(orc);
}
-gboolean category_fill_cb(GtkComboBox *cb, char *select)
+static gboolean category_fill_cb(GtkComboBox *cb, char *selection)
{
OrageRc *orc;
gchar **cat_gourps;
@@ -1764,7 +1764,7 @@ gboolean category_fill_cb(GtkComboBox *cb, char *select)
gtk_combo_box_set_active(cb, 0);
for (i = 0; cat_gourps[i] != NULL; i++) {
gtk_combo_box_append_text(cb, (const gchar *)cat_gourps[i]);
- if (!found && select && !strcmp(select, cat_gourps[i])) {
+ if (!found && selection && !strcmp(selection, cat_gourps[i])) {
gtk_combo_box_set_active(cb, i);
found = TRUE;
}
@@ -1774,7 +1774,7 @@ gboolean category_fill_cb(GtkComboBox *cb, char *select)
return(found);
}
-void orage_category_refill_cb(appt_win *apptw)
+static void orage_category_refill_cb(appt_win *apptw)
{
gchar *tmp;
@@ -1794,7 +1794,7 @@ void orage_category_refill_cb(appt_win *apptw)
gtk_widget_show(apptw->Categories_cb);
}
-void fill_category_data(appt_win *apptw, xfical_appt *appt)
+static void fill_category_data(appt_win *apptw, xfical_appt *appt)
{
gchar *tmp = NULL;
@@ -1817,7 +1817,7 @@ void fill_category_data(appt_win *apptw, xfical_appt *appt)
, (appt->categories ? appt->categories : ""));
}
-void orage_category_write_entry(gchar *category, GdkColor *color)
+static void orage_category_write_entry(gchar *category, GdkColor *color)
{
OrageRc *orc;
char *color_str;
diff --git a/src/day-view.c b/src/day-view.c
index e9e7234..cecb226 100644
--- a/src/day-view.c
+++ b/src/day-view.c
@@ -799,7 +799,7 @@ static void build_day_view_table(day_win *dw)
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};
+ gint monthdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
GtkWidget *vp;
orage_category_get_list();
diff --git a/src/event-list.c b/src/event-list.c
index 9e66df2..018217a 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -250,7 +250,7 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
{
el_win *el = (el_win *)user_data;
- gchar *stime, *etime, *stime2;
+ gchar *s_time, *etime, *stime2;
gchar start_time[17], end_time[17];
gint len;
@@ -264,15 +264,15 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
return;
}
- gtk_tree_model_get(model, iter, COL_TIME, &stime, -1);
+ gtk_tree_model_get(model, iter, COL_TIME, &s_time, -1);
/* we need to remember the real address in case we increment it,
* so that we can free the correct pointer */
- stime2 = stime;
- if (stime[0] == '+')
- stime++;
- etime = stime + 8; /* hh:mm - hh:mm */
+ stime2 = s_time;
+ if (s_time[0] == '+')
+ s_time++;
+ etime = s_time + 8; /* hh:mm - hh:mm */
/* only add special highlight if we are on today (=start with time) */
- if (stime[2] != ':') {
+ if (s_time[2] != ':') {
g_object_set(rend
, "foreground-set", FALSE
, "strikethrough-set", FALSE
@@ -288,7 +288,7 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
, "weight-set", TRUE
, NULL);
}
- else if (strncmp(stime, el->time_now, 5) <= 0
+ else if (strncmp(s_time, el->time_now, 5) <= 0
&& strncmp(etime, el->time_now, 5) >= 0) { /* current */
g_object_set(rend
, "foreground", "Blue"
@@ -309,19 +309,19 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
g_free(stime2);
}
else if (el->page == TODO_PAGE) {
- gtk_tree_model_get(model, iter, COL_SORT, &stime, -1);
- if (stime[8] == 'T') { /* date+time */
+ gtk_tree_model_get(model, iter, COL_SORT, &s_time, -1);
+ if (s_time[8] == 'T') { /* date+time */
len = 15;
}
else { /* date only */
len = 8;
}
- strncpy(start_time, stime, len);
+ strncpy(start_time, s_time, len);
gtk_tree_model_get(model, iter, COL_TIME, &stime2, -1);
if (g_str_has_suffix(stime2, "- ...")) /* no due time */
strncpy(end_time, "99999", len); /* long in the future*/
else /* normal due time*/
- strncpy(end_time, stime+len, len);
+ strncpy(end_time, s_time+len, len);
if (strncmp(end_time, el->date_now, len) < 0) { /* gone */
g_object_set(rend
, "foreground", "Red"
@@ -349,7 +349,7 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
, "weight-set", TRUE
, NULL);
}
- g_free(stime);
+ g_free(s_time);
g_free(stime2);
}
else {
@@ -367,12 +367,12 @@ static void add_el_row(el_win *el, xfical_appt *appt, char *par)
GtkListStore *list1;
gchar *title = NULL, *tmp;
gchar flags[6];
- gchar *stime;
+ gchar *s_time;
gchar /* *s_sort,*/ *s_sort1;
gchar *tmp_note;
- gint len = 50;
+ guint len = 50;
- stime = format_time(el, appt, par);
+ s_time = format_time(el, appt, par);
if (appt->alarmtime != 0)
if (appt->sound != NULL)
flags[0] = 'S';
@@ -432,7 +432,7 @@ static void add_el_row(el_win *el, xfical_appt *appt, char *par)
list1 = el->ListStore;
gtk_list_store_append(list1, &iter1);
gtk_list_store_set(list1, &iter1
- , COL_TIME, stime
+ , COL_TIME, s_time
, COL_FLAGS, flags
, COL_HEAD, title
, COL_UID, appt->uid
@@ -441,7 +441,7 @@ static void add_el_row(el_win *el, xfical_appt *appt, char *par)
, -1);
g_free(title);
g_free(s_sort1);
- g_free(stime);
+ g_free(s_time);
/*
g_free(s_sort);
*/
@@ -960,7 +960,7 @@ static void on_journal_start_button_clicked(GtkWidget *button
}
static void drag_data_get(GtkWidget *widget, GdkDragContext *context
- , GtkSelectionData *selection_data, guint info, guint time
+ , GtkSelectionData *selection_data, guint info, guint i_time
, gpointer user_data)
{
GtkTreeSelection *sel;
diff --git a/src/functions.c b/src/functions.c
index eceb0f8..bdbcada 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -655,7 +655,7 @@ char *orage_i18_date_to_icaldate(const char *i18_date)
return(icalt);
}
-struct tm *orage_localtime()
+struct tm *orage_localtime(void)
{
time_t tt;
@@ -663,7 +663,7 @@ struct tm *orage_localtime()
return(localtime(&tt));
}
-char *orage_localdate_i18()
+char *orage_localdate_i18(void)
{
struct tm *t;
@@ -674,7 +674,7 @@ char *orage_localdate_i18()
/* move one day forward or backward */
void orage_move_day(struct tm *t, int day)
{
- guint monthdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+ gint monthdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
if (day < -1 || day > 1) {
g_warning("orage: orage_move_day wrong parameter %d", day);
diff --git a/src/functions.h b/src/functions.h
index 542ce36..f8c6a52 100644
--- a/src/functions.h
+++ b/src/functions.h
@@ -139,4 +139,7 @@ gint orage_error_dialog(GtkWindow *parent
GtkWidget *orage_create_framebox_with_content(const gchar *title
, GtkWidget *content);
+/* NOTE: the following is in main.c */
+void orage_toggle_visible(void);
+
#endif /* !__ORAGE_FUNCTIONS_H__ */
diff --git a/src/ical-archive.c b/src/ical-archive.c
index 7ed3b87..da3ba50 100644
--- a/src/ical-archive.c
+++ b/src/ical-archive.c
@@ -64,6 +64,7 @@
#include "mainbox.h"
#include "reminder.h"
#include "ical-code.h"
+#include "ical-internal.h"
#include "event-list.h"
#include "appointment.h"
#include "parameters.h"
@@ -76,25 +77,6 @@
-/* this is in ical-code.c, too. ugly. should be in h file */
-typedef struct
-{
- struct icaltimetype stime; /* start time */
- struct icaltimetype etime; /* end time */
- struct icaldurationtype duration;
- struct icaltimetype ctime; /* completed time for VTODO appointmnets */
- icalcomponent_kind ikind; /* type of component, VEVENt, VTODO... */
-} xfical_period;
-
-/* in ical-code.c: */
-char *ic_get_char_timezone(icalproperty *p);
-struct icaltimetype ic_convert_to_timezone(struct icaltimetype t
- , icalproperty *p);
-xfical_period ic_get_period(icalcomponent *c, gboolean local);
-gboolean ic_internal_file_open(icalcomponent **p_ical
- , icalset **p_fical, gchar *file_icalpath, gboolean test);
-
-
extern icalset *ic_fical;
extern icalcomponent *ic_ical;
#ifdef HAVE_ARCHIVE
diff --git a/src/ical-code.c b/src/ical-code.c
index de24a2c..531f33e 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -64,6 +64,7 @@
#include "mainbox.h"
#include "reminder.h"
#include "ical-code.h"
+#include "ical-internal.h"
#include "event-list.h"
#include "appointment.h"
#include "parameters.h"
@@ -87,15 +88,6 @@ static void xfical_alarm_build_list_internal(gboolean first_list_today);
typedef struct
{
- struct icaltimetype stime; /* start time */
- struct icaltimetype etime; /* end time */
- struct icaldurationtype duration;
- struct icaltimetype ctime; /* completed time for VTODO appointmnets */
- icalcomponent_kind ikind; /* type of component, VEVENt, VTODO... */
-} xfical_period;
-
-typedef struct
-{
int count; /* how many timezones we have */
char **city; /* pointer to timezone location name strings */
int *utc_offset; /* pointer to int array holding utc offsets */
@@ -803,7 +795,7 @@ int xfical_compare_times(xfical_appt *appt)
{
#undef P_N
#define P_N "xfical_compare_times: "
- struct icaltimetype stime, etime;
+ struct icaltimetype s_time, etime;
const char *text;
struct icaldurationtype duration;
@@ -819,9 +811,9 @@ int xfical_compare_times(xfical_appt *appt)
orage_message(250, P_N "null start time");
return(0); /* should be error ! */
}
- stime = icaltime_from_string(appt->starttime);
+ s_time = icaltime_from_string(appt->starttime);
duration = icaldurationtype_from_int(appt->duration);
- etime = icaltime_add(stime, duration);
+ etime = icaltime_add(s_time, duration);
text = icaltime_as_ical_string(etime);
g_strlcpy(appt->endtime, text, 17);
g_free(appt->end_tz_loc);
@@ -832,17 +824,17 @@ int xfical_compare_times(xfical_appt *appt)
else {
if (ORAGE_STR_EXISTS(appt->starttime)
&& ORAGE_STR_EXISTS(appt->endtime)) {
- stime = icaltime_from_string(appt->starttime);
+ s_time = icaltime_from_string(appt->starttime);
etime = icaltime_from_string(appt->endtime);
- stime = convert_to_zone(stime, appt->start_tz_loc);
- stime = icaltime_convert_to_zone(stime, local_icaltimezone);
+ s_time = convert_to_zone(s_time, appt->start_tz_loc);
+ s_time = icaltime_convert_to_zone(s_time, local_icaltimezone);
etime = convert_to_zone(etime, appt->end_tz_loc);
etime = icaltime_convert_to_zone(etime, local_icaltimezone);
- duration = icaltime_subtract(etime, stime);
+ duration = icaltime_subtract(etime, s_time);
appt->duration = icaldurationtype_as_int(duration);
- return(icaltime_compare(stime, etime));
+ return(icaltime_compare(s_time, etime));
}
else {
orage_message(250, P_N "null time %s %s"
@@ -856,7 +848,7 @@ int xfical_compare_times(xfical_appt *appt)
* returns: NULL if failed and pointer to xfical_appt if successfull.
* You must free it after not being used anymore. (g_free())
*/
-xfical_appt *xfical_appt_alloc()
+xfical_appt *xfical_appt_alloc(void)
{
#undef P_N
#define P_N "xfical_appt_alloc: "
@@ -875,7 +867,7 @@ xfical_appt *xfical_appt_alloc()
return(appt);
}
-char *ic_generate_uid()
+char *ic_generate_uid(void)
{
#undef P_N
#define P_N "ic_generate_uid: "
@@ -1758,7 +1750,7 @@ static void get_appt_alarm_from_icalcomponent(icalcomponent *c
}
static void process_start_date(xfical_appt *appt, icalproperty *p
- , struct icaltimetype *itime, struct icaltimetype *stime
+ , struct icaltimetype *itime, struct icaltimetype *s_time
, struct icaltimetype *sltime, struct icaltimetype *etime)
{
#undef P_N
@@ -1770,7 +1762,7 @@ static void process_start_date(xfical_appt *appt, icalproperty *p
#endif
text = icalproperty_get_value_as_string(p);
*itime = icaltime_from_string(text);
- *stime = ic_convert_to_timezone(*itime, p);
+ *s_time = ic_convert_to_timezone(*itime, p);
*sltime = convert_to_local_timezone(*itime, p);
g_strlcpy(appt->starttime, text, 17);
if (icaltime_is_date(*itime)) {
@@ -1788,7 +1780,7 @@ static void process_start_date(xfical_appt *appt, icalproperty *p
if (appt->endtime[0] == '\0') {
g_strlcpy(appt->endtime, appt->starttime, 17);
appt->end_tz_loc = appt->start_tz_loc;
- etime = stime;
+ etime = s_time;
}
}
@@ -1930,13 +1922,13 @@ static void ical_appt_get_rrule_internal(icalcomponent *c, xfical_appt *appt
appt->interval = rrule.interval;
}
-gboolean get_appt_from_icalcomponent(icalcomponent *c, xfical_appt *appt)
+static gboolean get_appt_from_icalcomponent(icalcomponent *c, xfical_appt *appt)
{
#undef P_N
#define P_N "get_appt_from_icalcomponent: "
const char *text;
icalproperty *p = NULL;
- struct icaltimetype itime, stime, etime, sltime, eltime, wtime;
+ struct icaltimetype itime, s_time, etime, sltime, eltime, wtime;
icaltimezone *l_icaltimezone = NULL;
icalproperty_transp xf_transp;
struct icaldurationtype duration, duration_tmp;
@@ -1962,7 +1954,7 @@ gboolean get_appt_from_icalcomponent(icalcomponent *c, xfical_appt *appt)
return(FALSE);
}
/*********** Defaults ***********/
- stime = icaltime_null_time();
+ s_time = icaltime_null_time();
sltime = icaltime_null_time();
eltime = icaltime_null_time();
duration = icaldurationtype_null_duration();
@@ -2047,7 +2039,7 @@ gboolean get_appt_from_icalcomponent(icalcomponent *c, xfical_appt *appt)
case ICAL_DTSTART_PROPERTY:
if (!stime_found)
process_start_date(appt, p
- , &itime, &stime, &sltime, &etime);
+ , &itime, &s_time, &sltime, &etime);
break;
case ICAL_DTEND_PROPERTY:
case ICAL_DUE_PROPERTY:
@@ -2074,7 +2066,7 @@ g_print("X PROPERTY: %s\n", text);
text = icalproperty_get_x_name(p);
if (g_str_has_prefix(text, "X-ORAGE-ORIG-DTSTART")) {
process_start_date(appt, p
- , &itime, &stime, &sltime, &etime);
+ , &itime, &s_time, &sltime, &etime);
stime_found = TRUE;
break;
}
@@ -2157,7 +2149,7 @@ g_print("X PROPERTY: %s\n", text);
/* need to set missing endtime or duration */
if (appt->use_duration) {
- etime = icaltime_add(stime, duration);
+ etime = icaltime_add(s_time, duration);
text = icaltime_as_ical_string(etime);
g_strlcpy(appt->endtime, text, 17);
appt->end_tz_loc = appt->start_tz_loc;
@@ -2171,7 +2163,7 @@ g_print("X PROPERTY: %s\n", text);
duration_tmp = icaldurationtype_from_int(60*60*24);
appt->duration -= icaldurationtype_as_int(duration_tmp);
duration = icaldurationtype_from_int(appt->duration);
- etime = icaltime_add(stime, duration);
+ etime = icaltime_add(s_time, duration);
text = icaltime_as_ical_string(etime);
g_strlcpy(appt->endtime, text, 17);
}
@@ -2518,7 +2510,7 @@ static void set_todo_times(icalcomponent *c, xfical_period *per)
}
/* this works in UTC times */
-struct icaltimetype count_alarm_time(xfical_period per
+static struct icaltimetype count_alarm_time(xfical_period per
, struct icaltimetype cur_time
, struct icaldurationtype dur
, icalparameter_related rel)
@@ -2559,7 +2551,7 @@ struct icaltimetype count_alarm_time(xfical_period per
* FIXME: We assume all alarms have similar trigger, which
* may not be true for other than Orage appointments
*/
-alarm_struct *process_alarm_trigger(icalcomponent *c
+static alarm_struct *process_alarm_trigger(icalcomponent *c
, icalcomponent *ca, struct icaltimetype cur_time, int *cnt_repeat)
{ /* c == main component; ca == alarm component */
#undef P_N
@@ -3218,7 +3210,7 @@ static gboolean xfical_mark_calendar_days(GtkCalendar *gtkcal
/* note that this not understand timezones, but gets always raw time,
* which we need to convert to correct timezone */
-void mark_calendar(icalcomponent *c, icaltime_span *span , void *data)
+static void mark_calendar(icalcomponent *c, icaltime_span *span , void *data)
{
#undef P_N
#define P_N "mark_calendar: "
@@ -3445,7 +3437,7 @@ void xfical_mark_calendar(GtkCalendar *gtkcal)
/* note that this not understand timezones, but gets always raw time,
* which we need to convert to correct timezone */
-void add_appt_to_list(icalcomponent *c, icaltime_span *span , void *data)
+static void add_appt_to_list(icalcomponent *c, icaltime_span *span , void *data)
{
#undef P_N
#define P_N "add_appt_to_list: "
@@ -3694,7 +3686,7 @@ static xfical_appt *xfical_appt_get_next_with_string_internal(char *str
xfical_appt *appt;
gboolean found_valid, search_done = FALSE;
struct icaltimetype it;
- const char *stime;
+ const char *s_time;
#ifdef ORAGE_DEBUG
orage_message(-200, P_N);
@@ -3812,14 +3804,14 @@ static xfical_appt *xfical_appt_get_next_with_string_internal(char *str
it = convert_to_zone(it, appt->start_tz_loc);
it = icaltime_convert_to_zone(it
, local_icaltimezone);
- stime = icaltime_as_ical_string(it);
- g_strlcpy(appt->starttimecur, stime, 17);
+ s_time = icaltime_as_ical_string(it);
+ g_strlcpy(appt->starttimecur, s_time, 17);
it = icaltime_from_string(appt->endtime);
it = convert_to_zone(it, appt->end_tz_loc);
it = icaltime_convert_to_zone(it
, local_icaltimezone);
- stime = icaltime_as_ical_string(it);
- g_strlcpy(appt->endtimecur, stime, 17);
+ s_time = icaltime_as_ical_string(it);
+ g_strlcpy(appt->endtimecur, s_time, 17);
}
beg = find_next(uid, end, "\nEND:");
if (!beg) {
diff --git a/src/interface.c b/src/interface.c
index f23639e..585cf78 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -105,7 +105,7 @@ gboolean orage_foreign_files_check(gpointer user_data)
return(FALSE);
}
-void static orage_file_entry_changed(GtkWidget *dialog, gpointer user_data)
+static void orage_file_entry_changed(GtkWidget *dialog, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
const gchar *s;
@@ -144,7 +144,7 @@ static gboolean copy_file(gchar *source, gchar *target)
return(ok);
}
-void static orage_file_save_button_clicked(GtkButton *button
+static void orage_file_save_button_clicked(GtkButton *button
, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
@@ -198,7 +198,7 @@ void static orage_file_save_button_clicked(GtkButton *button
}
#ifdef HAVE_ARCHIVE
-void static archive_file_entry_changed(GtkWidget *dialog, gpointer user_data)
+static void archive_file_entry_changed(GtkWidget *dialog, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
const gchar *s;
@@ -212,7 +212,7 @@ void static archive_file_entry_changed(GtkWidget *dialog, gpointer user_data)
}
}
-void static archive_file_save_button_clicked(GtkButton *button
+static void archive_file_save_button_clicked(GtkButton *button
, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
@@ -366,7 +366,7 @@ static void archive_file_open_button_clicked(GtkButton *button
}
#endif
-void exp_open_button_clicked(GtkButton *button, gpointer user_data)
+static void exp_open_button_clicked(GtkButton *button, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
GtkWidget *f_chooser;
@@ -398,7 +398,7 @@ void exp_open_button_clicked(GtkButton *button, gpointer user_data)
gtk_widget_destroy(f_chooser);
}
-void imp_open_button_clicked(GtkButton *button, gpointer user_data)
+static void imp_open_button_clicked(GtkButton *button, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
GtkWidget *f_chooser;
@@ -429,12 +429,12 @@ void imp_open_button_clicked(GtkButton *button, gpointer user_data)
}
#ifdef HAVE_ARCHIVE
-void on_archive_button_clicked_cb(GtkButton *button, gpointer user_data)
+static void on_archive_button_clicked_cb(GtkButton *button, gpointer user_data)
{
xfical_archive();
}
-void on_unarchive_button_clicked_cb(GtkButton *button, gpointer user_data)
+static void on_unarchive_button_clicked_cb(GtkButton *button, gpointer user_data)
{
xfical_unarchive();
}
@@ -451,12 +451,12 @@ gboolean orage_import_file(gchar *entry_filename)
return(FALSE);
}
-gboolean orage_export_file(gchar *entry_filename, gint count, gchar *uids)
+static gboolean orage_export_file(gchar *entry_filename, gint count, gchar *uids)
{
return(xfical_export_file(entry_filename, count, uids));
}
-void imp_save_button_clicked(GtkButton *button, gpointer user_data)
+static void imp_save_button_clicked(GtkButton *button, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
gchar *entry_filename, *filename, *filename_end;
@@ -490,7 +490,7 @@ void imp_save_button_clicked(GtkButton *button, gpointer user_data)
g_free(entry_filename);
}
-void exp_save_button_clicked(GtkButton *button, gpointer user_data)
+static void exp_save_button_clicked(GtkButton *button, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
gchar *entry_filename, *entry_uids;
@@ -525,7 +525,7 @@ void exp_save_button_clicked(GtkButton *button, gpointer user_data)
g_free(entry_uids);
}
-void for_open_button_clicked(GtkButton *button, gpointer user_data)
+static void for_open_button_clicked(GtkButton *button, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
GtkWidget *f_chooser;
@@ -555,7 +555,7 @@ void for_open_button_clicked(GtkButton *button, gpointer user_data)
gtk_widget_destroy(f_chooser);
}
-void orage_foreign_file_remove_line(gint del_line)
+static void orage_foreign_file_remove_line(gint del_line)
{
int i;
@@ -661,7 +661,7 @@ static void refresh_foreign_files(intf_win *intf_w, gboolean first)
gtk_widget_show_all(intf_w->for_cur_frame);
}
-gboolean orage_foreign_file_add_internal(gchar *filename, gboolean read_only)
+static gboolean orage_foreign_file_add_internal(gchar *filename, gboolean read_only)
{
gint i = 0;
@@ -707,7 +707,7 @@ gboolean orage_foreign_file_add(gchar *filename, gboolean read_only)
return(orage_foreign_file_add_internal(filename, read_only));
}
-void for_add_button_clicked(GtkButton *button, gpointer user_data)
+static void for_add_button_clicked(GtkButton *button, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
const gchar *entry_filename;
@@ -720,7 +720,7 @@ void for_add_button_clicked(GtkButton *button, gpointer user_data)
refresh_foreign_files(intf_w, FALSE);
}
-void close_intf_w(gpointer user_data)
+static void close_intf_w(gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
@@ -730,12 +730,12 @@ void close_intf_w(gpointer user_data)
interface_lock = FALSE;
}
-void close_button_clicked(GtkButton *button, gpointer user_data)
+static void close_button_clicked(GtkButton *button, gpointer user_data)
{
close_intf_w(user_data);
}
-void filemenu_close_activated(GtkMenuItem *menuitem, gpointer user_data)
+static void filemenu_close_activated(GtkMenuItem *menuitem, gpointer user_data)
{
close_intf_w(user_data);
}
@@ -747,7 +747,7 @@ static gboolean on_Window_delete_event(GtkWidget *w, GdkEvent *e
return(FALSE);
}
-void create_menu(intf_win *intf_w)
+static void create_menu(intf_win *intf_w)
{
/*
GtkWidget *menu_separator;
@@ -781,7 +781,7 @@ void create_menu(intf_win *intf_w)
, G_CALLBACK(filemenu_close_activated), intf_w);
}
-void create_toolbar(intf_win *intf_w)
+static void create_toolbar(intf_win *intf_w)
{
gint i = 0;
@@ -811,8 +811,8 @@ void create_toolbar(intf_win *intf_w)
, G_CALLBACK(close_button_clicked), intf_w);
}
-void handle_file_drag_data(GtkWidget *widget, GdkDragContext *context
- , GtkSelectionData *data, guint time, gboolean imp)
+static void handle_file_drag_data(GtkWidget *widget, GdkDragContext *context
+ , GtkSelectionData *data, guint d_time, gboolean imp)
{
gchar **file_list;
gchar *file;
@@ -821,7 +821,7 @@ void handle_file_drag_data(GtkWidget *widget, GdkDragContext *context
if (data->length < 0) {
g_warning("File drag failed");
- gtk_drag_finish(context, FALSE, FALSE, time);
+ gtk_drag_finish(context, FALSE, FALSE, d_time);
return;
}
file_list = g_uri_list_extract_uris((gchar *)data->data);
@@ -849,68 +849,68 @@ void handle_file_drag_data(GtkWidget *widget, GdkDragContext *context
}
}
}
- gtk_drag_finish(context, TRUE, FALSE, time);
+ gtk_drag_finish(context, TRUE, FALSE, d_time);
}
-void imp_file_drag_data_received(GtkWidget *widget, GdkDragContext *context
- , gint x, gint y, GtkSelectionData *data, guint info, guint time)
+static void imp_file_drag_data_received(GtkWidget *widget, GdkDragContext *context
+ , gint x, gint y, GtkSelectionData *data, guint info, guint d_time)
{
- handle_file_drag_data(widget, context, data, time, TRUE);
+ handle_file_drag_data(widget, context, data, d_time, TRUE);
}
-void exp_file_drag_data_received(GtkWidget *widget, GdkDragContext *context
- , gint x, gint y, GtkSelectionData *data, guint info, guint time)
+static void exp_file_drag_data_received(GtkWidget *widget, GdkDragContext *context
+ , gint x, gint y, GtkSelectionData *data, guint info, guint d_time)
{
- handle_file_drag_data(widget, context, data, time, FALSE);
+ handle_file_drag_data(widget, context, data, d_time, FALSE);
}
-void uid_drag_data_received(GtkWidget *widget, GdkDragContext *context
- , gint x, gint y, GtkSelectionData *data, guint info, guint time)
+static void uid_drag_data_received(GtkWidget *widget, GdkDragContext *context
+ , gint x, gint y, GtkSelectionData *data, guint info, guint d_time)
{
if (data->length < 0) {
g_warning("UID drag failed");
- gtk_drag_finish(context, FALSE, FALSE, time);
+ gtk_drag_finish(context, FALSE, FALSE, d_time);
return;
}
- gtk_drag_finish(context, TRUE, FALSE, time);
+ gtk_drag_finish(context, TRUE, FALSE, d_time);
}
/*
gboolean drag_motion(GtkWidget *widget, GdkDragContext *context
- , gint x, gint y, guint time)
+ , gint x, gint y, guint d_time)
{
g_print ("drag_motion\n");
if (context->actions & GDK_ACTION_COPY) {
g_print ("drag_motion: accept\n");
- gdk_drag_status(context, GDK_ACTION_COPY, time);
+ gdk_drag_status(context, GDK_ACTION_COPY, d_time);
gtk_drag_highlight(widget);
return(TRUE);
}
else {
g_print ("drag_motion: fail\n");
- gdk_drag_status(context, 0, time);
+ gdk_drag_status(context, 0, d_time);
return(FALSE);
}
}
-void drag_leave(GtkWidget *widget, GdkDragContext *context, guint time)
+void drag_leave(GtkWidget *widget, GdkDragContext *context, guint d_time)
{
g_print ("drag_leave\n");
gtk_drag_unhighlight(widget);
}
*/
-gboolean drag_drop(GtkWidget *widget, GdkDragContext *context
- , gint x, gint y, guint time)
+static gboolean drag_drop(GtkWidget *widget, GdkDragContext *context
+ , gint x, gint y, guint d_time)
{
gtk_drag_get_data(widget, context
- , GDK_POINTER_TO_ATOM(context->targets->data), time);
+ , GDK_POINTER_TO_ATOM(context->targets->data), d_time);
return(TRUE);
}
-void drag_and_drop_init(intf_win *intf_w)
+static void drag_and_drop_init(intf_win *intf_w)
{
/*
g_signal_connect(intf_w->iea_imp_entry, "drag_motion"
@@ -943,21 +943,21 @@ void drag_and_drop_init(intf_win *intf_w)
, G_CALLBACK(uid_drag_data_received), NULL);
}
-void exp_add_all_rb_clicked(GtkWidget *button, gpointer *user_data)
+static void exp_add_all_rb_clicked(GtkWidget *button, gpointer *user_data)
{
intf_win *intf_w = (intf_win *)user_data;
gtk_widget_set_sensitive(intf_w->iea_exp_id_entry, FALSE);
}
-void exp_add_id_rb_clicked(GtkWidget *button, gpointer *user_data)
+static void exp_add_id_rb_clicked(GtkWidget *button, gpointer *user_data)
{
intf_win *intf_w = (intf_win *)user_data;
gtk_widget_set_sensitive(intf_w->iea_exp_id_entry, TRUE);
}
-void create_import_export_tab(intf_win *intf_w)
+static void create_import_export_tab(intf_win *intf_w)
{
GtkWidget *label, *hbox, *vbox, *m_vbox;
gchar *file;
@@ -1103,7 +1103,7 @@ void create_import_export_tab(intf_win *intf_w)
#endif
}
-void create_orage_file_tab(intf_win *intf_w)
+static void create_orage_file_tab(intf_win *intf_w)
{
GtkWidget *label, *hbox, *vbox, *m_vbox;
diff --git a/src/interface.h b/src/interface.h
index ed5360e..f92c89f 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -100,5 +100,6 @@ void orage_external_interface(CalWin *xfcal);
gboolean orage_foreign_files_check(gpointer user_data);
gboolean orage_foreign_file_add(gchar *filename, gboolean read_only);
gboolean orage_foreign_file_remove(gchar *filename);
+gboolean orage_import_file(gchar *entry_filename);
#endif /* !__INTERFACE_H__ */
diff --git a/src/main.c b/src/main.c
index ff8eaca..75d0695 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,34 +84,28 @@ static void send_event(char *event)
gdk_event_send_client_message((GdkEvent *)&gev, (GdkNativeWindow)xwindow);
}
-void orage_toggle_visible()
+void orage_toggle_visible(void)
{
send_event("_XFCE_CALENDAR_TOGGLE_HERE");
}
-void raise_orage()
+static void raise_orage(void)
{
send_event("_XFCE_CALENDAR_RAISE");
}
-gboolean mWindow_delete_event_cb(GtkWidget *widget, GdkEvent *event
+static gboolean mWindow_delete_event_cb(GtkWidget *widget, GdkEvent *event
, gpointer user_data)
{
orage_toggle_visible();
return(TRUE);
}
-static void raise_window()
+static void raise_window(void)
{
- GdkScreen *screen = NULL;
GdkWindow *window;
CalWin *cal = (CalWin *)g_par.xfcal;
- /*
- screen = xfce_gdk_display_locate_monitor_with_pointer(NULL, NULL);
- gtk_window_set_screen(GTK_WINDOW(cal->mWindow)
- , screen ? screen : gdk_screen_get_default());
- */
if (g_par.pos_x || g_par.pos_y)
gtk_window_move(GTK_WINDOW(cal->mWindow)
, g_par.pos_x, g_par.pos_y);
@@ -158,7 +152,7 @@ static gboolean client_message_received(GtkWidget *widget
return(FALSE);
}
-gboolean keep_tidy(void)
+static gboolean keep_tidy(void)
{
#ifdef HAVE_ARCHIVE
/* move old appointment to other file to keep the active
@@ -402,7 +396,7 @@ static gboolean process_args(int argc, char *argv[], gboolean running
return(end);
}
-static gboolean check_orage_alive()
+static gboolean check_orage_alive(void)
{
Window xwindow;
@@ -413,7 +407,7 @@ static gboolean check_orage_alive()
return(FALSE);
}
-static void mark_orage_alive()
+static void mark_orage_alive(void)
{
GtkWidget *hidden;
diff --git a/src/mainbox.c b/src/mainbox.c
index 49a5bea..739b4f7 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -56,7 +56,7 @@
*/
-gboolean orage_mark_appointments()
+gboolean orage_mark_appointments(void)
{
#undef P_N
#define P_N "orage_mark_appointments: "
@@ -193,15 +193,14 @@ static void mHelp_help_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- helpdoc = g_strconcat("xfbrowser4 ", PACKAGE_DATA_DIR
+ helpdoc = g_strconcat("firefox ", PACKAGE_DATA_DIR
, G_DIR_SEPARATOR_S, "orage"
, G_DIR_SEPARATOR_S, "doc"
, G_DIR_SEPARATOR_S, "C"
, G_DIR_SEPARATOR_S, "orage.html"
, NULL);
- if (!orage_exec(helpdoc, FALSE, NULL))
- orage_message(100, "%s: start of %s failed: %s", "Orage", helpdoc
- , error->message);
+ if (!orage_exec(helpdoc, FALSE, &error))
+ orage_message(100, "start of %s failed: %s", helpdoc, error->message);
g_free(helpdoc);
}
@@ -499,8 +498,8 @@ static void info_process(gpointer a, gpointer pbox)
{
#undef P_N
#define P_N "info_process: "
- xfical_appt *appt = (xfical_appt *)a;;
- GtkBox *box = GTK_BOX(pbox);
+ xfical_appt *appt = (xfical_appt *)a;
+ GtkBox *box= GTK_BOX(pbox);
CalWin *cal = (CalWin *)g_par.xfcal;
gboolean todo;
@@ -711,7 +710,7 @@ static void mCalendar_day_selected_cb(GtkCalendar *calendar
build_mainbox_event_box();
}
-void build_mainbox_event_box()
+void build_mainbox_event_box(void)
{
#undef P_N
#define P_N "build_mainbox_event_box: "
@@ -742,7 +741,7 @@ void build_mainbox_info(void)
build_mainbox_event_info();
}
-void build_mainWin()
+void build_mainWin(void)
{
#undef P_N
#define P_N "build_mainWin: "
diff --git a/src/orage-dbus-client.c b/src/orage-dbus-client.c
index 3c7147c..f263d51 100644
--- a/src/orage-dbus-client.c
+++ b/src/orage-dbus-client.c
@@ -28,6 +28,7 @@
#include <dbus/dbus-glib-lowlevel.h>
+#include "orage-dbus.h"
/*
#include "orage-dbus-object.h"
#include "orage-dbus-service.h"
diff --git a/src/orage-dbus-object.c b/src/orage-dbus-object.c
index 61be9ff..21cea45 100644
--- a/src/orage-dbus-object.c
+++ b/src/orage-dbus-object.c
@@ -58,13 +58,13 @@ static void orage_dbus_class_init(OrageDBusClass *orage_class)
, &dbus_glib_orage_object_info);
}
-static void orage_dbus_init(OrageDBus *orage_dbus)
+static void orage_dbus_init(OrageDBus *o_dbus)
{
GError *error = NULL;
/* try to connect to the session bus */
- orage_dbus->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
- if (orage_dbus->connection == NULL) {
+ o_dbus->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+ if (o_dbus->connection == NULL) {
/* notify the user that D-BUS service won't be available */
g_warning("Failed to connect to the D-BUS session bus: %s"
, error->message);
@@ -72,17 +72,17 @@ static void orage_dbus_init(OrageDBus *orage_dbus)
}
else {
/* register the /org/xfce/calendar object for orage */
- dbus_g_connection_register_g_object(orage_dbus->connection
- , "/org/xfce/calendar", G_OBJECT(orage_dbus));
+ dbus_g_connection_register_g_object(o_dbus->connection
+ , "/org/xfce/calendar", G_OBJECT(o_dbus));
/* request the org.xfce.calendar name for orage */
dbus_bus_request_name(dbus_g_connection_get_connection(
- orage_dbus->connection), "org.xfce.calendar"
+ o_dbus->connection), "org.xfce.calendar"
, DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
/* request the org.xfce.orage name for orage */
dbus_bus_request_name(dbus_g_connection_get_connection(
- orage_dbus->connection), "org.xfce.orage"
+ o_dbus->connection), "org.xfce.orage"
, DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
}
}
@@ -107,7 +107,7 @@ gboolean orage_dbus_service_add_foreign(DBusGProxy *proxy
, const char *IN_file, const gboolean *IN_mode
, GError **error)
{
- if (orage_foreign_file_add((char *)IN_file, (gboolean)IN_mode)) {
+ if (orage_foreign_file_add((char *)IN_file, (gboolean)*IN_mode)) {
g_message("Orage **: DBUS Foreign file added %s", IN_file);
return(TRUE);
}
@@ -132,7 +132,7 @@ gboolean orage_dbus_service_remove_foreign(DBusGProxy *proxy
}
-void orage_dbus_start()
+void orage_dbus_start(void)
{
orage_dbus = g_object_new(ORAGE_DBUS_TYPE, NULL);
}
diff --git a/src/orage-dbus-object.h b/src/orage-dbus-object.h
index ab62631..6907fef 100644
--- a/src/orage-dbus-object.h
+++ b/src/orage-dbus-object.h
@@ -50,6 +50,8 @@ gboolean orage_dbus_service_remove_foreign(DBusGProxy *proxy
, const char *IN_file
, GError **error);
+void orage_dbus_start(void);
+
G_END_DECLS;
diff --git a/src/parameters.c b/src/parameters.c
index d4c0b44..b421322 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -49,7 +49,7 @@
#include "parameters.h"
#include "mainbox.h"
-extern g_log_level;
+extern int g_log_level;
static gboolean is_running = FALSE;
@@ -135,7 +135,7 @@ typedef struct _Itf
/* Return the first day of the week, where 0=monday, 6=sunday.
* Borrowed from GTK+:s Calendar Widget, but modified
* to return 0..6 mon..sun, which is what libical uses */
-int get_first_weekday_from_locale()
+static int get_first_weekday_from_locale(void)
{
#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
union { unsigned int word; char *string; } langinfo;
@@ -167,16 +167,19 @@ static void dialog_response(GtkWidget *dialog, gint response_id
{
Itf *itf = (Itf *)user_data;
gchar *helpdoc;
+ GError *error = NULL;
if (response_id == GTK_RESPONSE_HELP) {
/* Needs to be in " to keep # */
- helpdoc = g_strconcat("xfbrowser4 \"", PACKAGE_DATA_DIR
+ helpdoc = g_strconcat("firefox \"", PACKAGE_DATA_DIR
, G_DIR_SEPARATOR_S, "orage"
, G_DIR_SEPARATOR_S, "doc"
, G_DIR_SEPARATOR_S, "C"
, G_DIR_SEPARATOR_S, "orage.html#orage-preferences-window\""
, NULL);
- orage_exec(helpdoc, NULL, NULL);
+ if (!orage_exec(helpdoc, FALSE, &error))
+ orage_message(100, "start of %s failed: %s", helpdoc
+ , error->message);
}
else { /* delete signal or close response */
write_parameters();
@@ -197,7 +200,7 @@ static void sound_application_changed(GtkWidget *dialog, gpointer user_data)
GTK_ENTRY(itf->sound_application_entry)));
}
-static void set_border()
+static void set_border(void)
{
gtk_window_set_decorated(GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow)
, g_par.show_borders);
@@ -212,7 +215,7 @@ static void borders_changed(GtkWidget *dialog, gpointer user_data)
set_border();
}
-static void set_menu()
+static void set_menu(void)
{
if (g_par.show_menu)
gtk_widget_show(((CalWin *)g_par.xfcal)->mMenubar);
@@ -229,7 +232,7 @@ static void menu_changed(GtkWidget *dialog, gpointer user_data)
set_menu();
}
-static void set_calendar()
+static void set_calendar(void)
{
gtk_calendar_set_display_options(
GTK_CALENDAR(((CalWin *)g_par.xfcal)->mCalendar)
@@ -265,7 +268,7 @@ static void weeks_changed(GtkWidget *dialog, gpointer user_data)
set_calendar();
}
-static void set_todos()
+static void set_todos(void)
{
if (g_par.show_todos)
gtk_widget_show_all(((CalWin *)g_par.xfcal)->mTodo_vbox);
@@ -291,7 +294,7 @@ static void show_events_spin_changed(GtkSpinButton *sb, gpointer user_data)
gtk_widget_hide_all(((CalWin *)g_par.xfcal)->mEvent_vbox);
}
-static void set_stick()
+static void set_stick(void)
{
if (g_par.set_stick)
gtk_window_stick(GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow));
@@ -308,7 +311,7 @@ static void stick_changed(GtkWidget *dialog, gpointer user_data)
set_stick();
}
-static void set_ontop()
+static void set_ontop(void)
{
gtk_window_set_keep_above(GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow)
, g_par.set_ontop);
@@ -323,7 +326,7 @@ static void ontop_changed(GtkWidget *dialog, gpointer user_data)
set_ontop();
}
-static void set_taskbar()
+static void set_taskbar(void)
{
gtk_window_set_skip_taskbar_hint(
GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow), !g_par.show_taskbar);
@@ -338,7 +341,7 @@ static void taskbar_changed(GtkWidget *dialog, gpointer user_data)
set_taskbar();
}
-static void set_pager()
+static void set_pager(void)
{
gtk_window_set_skip_pager_hint(GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow)
, !g_par.show_pager);
@@ -353,7 +356,7 @@ static void pager_changed(GtkWidget *dialog, gpointer user_data)
set_pager();
}
-static void set_systray()
+static void set_systray(void)
{
GdkPixbuf *orage_logo;
@@ -894,7 +897,7 @@ static void create_parameter_dialog_extra_setup_tab(Itf *dialog)
, G_CALLBACK(el_extra_days_spin_changed), dialog);
}
-Itf *create_parameter_dialog()
+static Itf *create_parameter_dialog(void)
{
Itf *dialog;
GdkPixbuf *orage_logo;
@@ -950,7 +953,7 @@ Itf *create_parameter_dialog()
return(dialog);
}
-OrageRc *orage_parameters_file_open(gboolean read_only)
+static OrageRc *orage_parameters_file_open(gboolean read_only)
{
gchar *fpath;
OrageRc *orc;
@@ -964,7 +967,7 @@ OrageRc *orage_parameters_file_open(gboolean read_only)
return(orc);
}
-void write_parameters()
+void write_parameters(void)
{
OrageRc *orc;
gint i;
@@ -1040,7 +1043,7 @@ void write_parameters()
/* let's try to find the timezone name by comparing this file to
* timezone files from the default location. This does not work
* always, but is the best trial we can do */
-void init_dtz_check_dir(gchar *tz_dirname, gchar *tz_local, gint len)
+static void init_dtz_check_dir(gchar *tz_dirname, gchar *tz_local, gint len)
{
gint tz_offset = strlen("/usr/share/zoneinfo/");
gsize tz_len; /* file lengths */
@@ -1061,7 +1064,7 @@ void init_dtz_check_dir(gchar *tz_dirname, gchar *tz_local, gint len)
}
else if (g_file_get_contents(tz_fullfile, &tz_data, &tz_len
, &error)) {
- if (len == tz_len && !memcmp(tz_local, tz_data, len)) {
+ if (len == (int)tz_len && !memcmp(tz_local, tz_data, len)) {
/* this is a match (length is tested first since that
* test is quick and it eliminates most) */
g_par.local_timezone = g_strdup(tz_fullfile+tz_offset);
@@ -1086,7 +1089,7 @@ void init_dtz_check_dir(gchar *tz_dirname, gchar *tz_local, gint len)
}
}
-void init_default_timezone()
+static void init_default_timezone(void)
{
gsize len; /* file lengths */
gchar *tz_local; /* local timezone data */
@@ -1186,7 +1189,7 @@ void read_parameters(void)
orage_rc_file_close(orc);
}
-void show_parameters()
+void show_parameters(void)
{
static Itf *dialog = NULL;
@@ -1199,7 +1202,7 @@ void show_parameters()
}
}
-void set_parameters()
+void set_parameters(void)
{
set_menu();
set_border();
diff --git a/src/reminder.c b/src/reminder.c
index 9ba7bf3..33ec2ca 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -69,30 +69,29 @@ typedef struct _orage_ddmmhh_hbox
GtkWidget *dialog;
} orage_ddmmhh_hbox_struct;
-static void create_notify_reminder(alarm_struct *alarm);
-void create_reminders(alarm_struct *alarm);
+static void create_notify_reminder(alarm_struct *l_alarm);
static void reset_orage_alarm_clock();
static void alarm_free(gpointer galarm)
{
#undef P_N
#define P_N "alarm_free: "
- alarm_struct *alarm = (alarm_struct *)galarm;
+ alarm_struct *l_alarm = (alarm_struct *)galarm;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- g_free(alarm->alarm_time);
- g_free(alarm->action_time);
- g_free(alarm->uid);
- g_free(alarm->title);
- g_free(alarm->description);
- g_free(alarm->sound);
- g_free(alarm->sound_cmd);
- g_free(alarm->cmd);
- g_free(alarm->active_alarm);
- g_free(alarm->orage_display_data);
- g_free(alarm);
+ g_free(l_alarm->alarm_time);
+ g_free(l_alarm->action_time);
+ g_free(l_alarm->uid);
+ g_free(l_alarm->title);
+ g_free(l_alarm->description);
+ g_free(l_alarm->sound);
+ g_free(l_alarm->sound_cmd);
+ g_free(l_alarm->cmd);
+ g_free(l_alarm->active_alarm);
+ g_free(l_alarm->orage_display_data);
+ g_free(l_alarm);
}
static gint alarm_order(gconstpointer a, gconstpointer b)
@@ -112,12 +111,12 @@ static gint alarm_order(gconstpointer a, gconstpointer b)
, ((alarm_struct *)b)->alarm_time));
}
-void alarm_list_free()
+void alarm_list_free(void)
{
#undef P_N
#define P_N "alarm_free_all: "
gchar *time_now;
- alarm_struct *alarm;
+ alarm_struct *l_alarm;
GList *alarm_l, *kept_l=NULL;
#ifdef ORAGE_DEBUG
@@ -130,8 +129,8 @@ void alarm_list_free()
for (alarm_l = g_list_first(g_par.alarm_list);
alarm_l != NULL;
alarm_l = g_list_first(g_par.alarm_list)) {
- alarm = alarm_l->data;
- if (alarm->temporary && (strcmp(time_now, alarm->alarm_time) < 0)) {
+ l_alarm = alarm_l->data;
+ if (l_alarm->temporary && (strcmp(time_now, l_alarm->alarm_time) < 0)) {
/* We keep temporary alarms, which have not yet fired.
Remove the element from the list, but do not loose it. */
g_par.alarm_list = g_list_remove_link(g_par.alarm_list, alarm_l);
@@ -142,9 +141,9 @@ void alarm_list_free()
*/
kept_l = g_list_concat(kept_l, alarm_l);
}
- else { /* get rid of that alarm element */
+ else { /* get rid of that l_alarm element */
alarm_free(alarm_l->data);
- g_par.alarm_list=g_list_remove(g_par.alarm_list, alarm);
+ g_par.alarm_list=g_list_remove(g_par.alarm_list, l_alarm);
}
}
g_list_free(g_par.alarm_list);
@@ -155,7 +154,7 @@ void alarm_list_free()
}
}
-static void alarm_free_memory(alarm_struct *alarm)
+static void alarm_free_memory(alarm_struct *l_alarm)
{
#undef P_N
#define P_N "alarm_free_memory: "
@@ -163,16 +162,16 @@ static void alarm_free_memory(alarm_struct *alarm)
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- if (!alarm->display_orage && !alarm->display_notify && !alarm->audio)
+ if (!l_alarm->display_orage && !l_alarm->display_notify && !l_alarm->audio)
/* all gone, need to clean memory */
- alarm_free(alarm);
- else if (!alarm->display_orage && !alarm->display_notify)
+ alarm_free(l_alarm);
+ else if (!l_alarm->display_orage && !l_alarm->display_notify)
/* if both visuals are gone we can't stop audio anymore, so stop it
* now before it is too late */
- alarm->repeat_cnt = 0;
+ l_alarm->repeat_cnt = 0;
}
-void alarm_add(alarm_struct *alarm)
+void alarm_add(alarm_struct *l_alarm)
{
#undef P_N
#define P_N "alarm_add: "
@@ -180,10 +179,10 @@ void alarm_add(alarm_struct *alarm)
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- g_par.alarm_list = g_list_prepend(g_par.alarm_list, alarm);
+ g_par.alarm_list = g_list_prepend(g_par.alarm_list, l_alarm);
}
-static alarm_struct *alarm_copy(alarm_struct *alarm, gboolean init)
+static alarm_struct *alarm_copy(alarm_struct *l_alarm, gboolean init)
{
#undef P_N
#define P_N "alarm_copy: "
@@ -194,45 +193,45 @@ static alarm_struct *alarm_copy(alarm_struct *alarm, gboolean init)
#endif
n_alarm = g_new0(alarm_struct, 1);
- /* first alarm values which are not modified */
- if (alarm->alarm_time != NULL)
- n_alarm->alarm_time = g_strdup(alarm->alarm_time);
- if (alarm->action_time != NULL)
- n_alarm->action_time = g_strdup(alarm->action_time);
- if (alarm->uid != NULL)
- n_alarm->uid = g_strdup(alarm->uid);
- if (alarm->title != NULL)
- n_alarm->title = orage_process_text_commands(alarm->title);
- if (alarm->description != NULL)
- n_alarm->description = orage_process_text_commands(alarm->description);
- n_alarm->persistent = alarm->persistent;
+ /* first l_alarm values which are not modified */
+ if (l_alarm->alarm_time != NULL)
+ n_alarm->alarm_time = g_strdup(l_alarm->alarm_time);
+ if (l_alarm->action_time != NULL)
+ n_alarm->action_time = g_strdup(l_alarm->action_time);
+ if (l_alarm->uid != NULL)
+ n_alarm->uid = g_strdup(l_alarm->uid);
+ if (l_alarm->title != NULL)
+ n_alarm->title = orage_process_text_commands(l_alarm->title);
+ if (l_alarm->description != NULL)
+ n_alarm->description = orage_process_text_commands(l_alarm->description);
+ n_alarm->persistent = l_alarm->persistent;
n_alarm->temporary = FALSE;
- n_alarm->notify_timeout = alarm->notify_timeout;
- if (alarm->sound != NULL)
- n_alarm->sound = g_strdup(alarm->sound);
- n_alarm->repeat_delay = alarm->repeat_delay;
- n_alarm->procedure = alarm->procedure;
- if (alarm->cmd != NULL)
- n_alarm->cmd = g_strdup(alarm->cmd);
+ n_alarm->notify_timeout = l_alarm->notify_timeout;
+ if (l_alarm->sound != NULL)
+ n_alarm->sound = g_strdup(l_alarm->sound);
+ n_alarm->repeat_delay = l_alarm->repeat_delay;
+ n_alarm->procedure = l_alarm->procedure;
+ if (l_alarm->cmd != NULL)
+ n_alarm->cmd = g_strdup(l_alarm->cmd);
n_alarm->active_alarm = g_new0(active_alarm_struct, 1);
n_alarm->orage_display_data = g_new0(orage_ddmmhh_hbox_struct, 1);
- /* then alarm values which are modified during the alarm handling */
+ /* then l_alarm values which are modified during the l_alarm handling */
if (init) {
- /* first call for this alarm, we can and must use real values.
+ /* first call for this l_alarm, we can and must use real values.
We do not have orig values yet. */
- n_alarm->display_orage = alarm->display_orage;
- n_alarm->display_notify = alarm->display_notify;
- n_alarm->audio = alarm->audio;
- n_alarm->repeat_cnt = alarm->repeat_cnt;
+ n_alarm->display_orage = l_alarm->display_orage;
+ n_alarm->display_notify = l_alarm->display_notify;
+ n_alarm->audio = l_alarm->audio;
+ n_alarm->repeat_cnt = l_alarm->repeat_cnt;
}
else {
- /* this is reminder based on earlier alarm,
+ /* this is reminder based on earlier l_alarm,
we need to use unmodifed original values */
- n_alarm->display_orage = alarm->display_orage_orig;
- n_alarm->display_notify = alarm->display_notify_orig;
- n_alarm->audio = alarm->audio_orig;
- n_alarm->repeat_cnt = alarm->repeat_cnt_orig;
+ n_alarm->display_orage = l_alarm->display_orage_orig;
+ n_alarm->display_notify = l_alarm->display_notify_orig;
+ n_alarm->audio = l_alarm->audio_orig;
+ n_alarm->repeat_cnt = l_alarm->repeat_cnt_orig;
}
/* finally store original values in case we need them later */
@@ -303,10 +302,10 @@ static alarm_struct *alarm_read_next_alarm(OrageRc *orc, gchar *time_now)
new_alarm->cmd = orage_rc_get_str(orc, "CMD", NULL);
/* let's first check if the time has gone so that we need to
- * send that delayed alarm or can we just ignore it since it is
+ * send that delayed l_alarm or can we just ignore it since it is
* still in the future */
if (strcmp(time_now, new_alarm->alarm_time) < 0) {
- /* real alarm has not happened yet */
+ /* real l_alarm has not happened yet */
if (new_alarm->temporary)
/* we need to store this or it will get lost */
alarm_add(new_alarm);
@@ -318,7 +317,7 @@ static alarm_struct *alarm_read_next_alarm(OrageRc *orc, gchar *time_now)
return(new_alarm);
}
-void alarm_read()
+void alarm_read(void)
{
#undef P_N
#define P_N "alarm_read: "
@@ -350,38 +349,38 @@ static void alarm_store(gpointer galarm, gpointer par)
{
#undef P_N
#define P_N "alarm_store: "
- alarm_struct *alarm = (alarm_struct *)galarm;
+ alarm_struct *l_alarm = (alarm_struct *)galarm;
OrageRc *orc = (OrageRc *)par;
#ifdef ORAGE_DEBUG
orage_message(-200, P_N);
#endif
- if (!alarm->persistent)
+ if (!l_alarm->persistent)
return; /* only store persistent alarms */
- orage_rc_set_group(par, alarm->uid);
+ orage_rc_set_group(par, l_alarm->uid);
- orage_rc_put_str(orc, "ALARM_TIME", alarm->alarm_time);
- orage_rc_put_str(orc, "ACTION_TIME", alarm->action_time);
- orage_rc_put_str(orc, "TITLE", alarm->title);
- orage_rc_put_str(orc, "DESCRIPTION", alarm->description);
- orage_rc_put_bool(orc, "DISPLAY_ORAGE", alarm->display_orage);
- orage_rc_put_bool(orc, "TEMPORARY", alarm->temporary);
+ orage_rc_put_str(orc, "ALARM_TIME", l_alarm->alarm_time);
+ orage_rc_put_str(orc, "ACTION_TIME", l_alarm->action_time);
+ orage_rc_put_str(orc, "TITLE", l_alarm->title);
+ orage_rc_put_str(orc, "DESCRIPTION", l_alarm->description);
+ orage_rc_put_bool(orc, "DISPLAY_ORAGE", l_alarm->display_orage);
+ orage_rc_put_bool(orc, "TEMPORARY", l_alarm->temporary);
#ifdef HAVE_NOTIFY
- orage_rc_put_bool(orc, "DISPLAY_NOTIFY", alarm->display_notify);
- orage_rc_put_int(orc, "NOTIFY_TIMEOUT", alarm->notify_timeout);
+ orage_rc_put_bool(orc, "DISPLAY_NOTIFY", l_alarm->display_notify);
+ orage_rc_put_int(orc, "NOTIFY_TIMEOUT", l_alarm->notify_timeout);
#endif
- orage_rc_put_bool(orc, "AUDIO", alarm->audio);
- orage_rc_put_str(orc, "SOUND", alarm->sound);
- orage_rc_put_int(orc, "REPEAT_CNT", alarm->repeat_cnt);
- orage_rc_put_int(orc, "REPEAT_DELAY", alarm->repeat_delay);
- orage_rc_put_bool(orc, "PROCEDURE", alarm->procedure);
- orage_rc_put_str(orc, "CMD", alarm->cmd);
+ orage_rc_put_bool(orc, "AUDIO", l_alarm->audio);
+ orage_rc_put_str(orc, "SOUND", l_alarm->sound);
+ orage_rc_put_int(orc, "REPEAT_CNT", l_alarm->repeat_cnt);
+ orage_rc_put_int(orc, "REPEAT_DELAY", l_alarm->repeat_delay);
+ orage_rc_put_bool(orc, "PROCEDURE", l_alarm->procedure);
+ orage_rc_put_str(orc, "CMD", l_alarm->cmd);
}
-static void store_persistent_alarms()
+static void store_persistent_alarms(void)
{
#undef P_N
#define P_N "store_persistent_alarms: "
@@ -405,7 +404,7 @@ static void notify_action_open(NotifyNotification *n, const char *action
{
#undef P_N
#define P_N "notify_action_open: "
- alarm_struct *alarm = (alarm_struct *)par;
+ alarm_struct *l_alarm = (alarm_struct *)par;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
@@ -414,10 +413,10 @@ static void notify_action_open(NotifyNotification *n, const char *action
* These two lines would keep notify window active and make it possible
* to start several times the appointment or start it and still be
* able to control sound. Not sure if they should be there or not.
- alarm->notify_refresh = TRUE;
- create_notify_reminder(alarm);
+ l_alarm->notify_refresh = TRUE;
+ create_notify_reminder(l_alarm);
*/
- create_appt_win("UPDATE", alarm->uid);
+ create_appt_win("UPDATE", l_alarm->uid);
}
#endif
@@ -425,7 +424,7 @@ static gboolean sound_alarm(gpointer data)
{
#undef P_N
#define P_N "sound_alarm: "
- alarm_struct *alarm = (alarm_struct *)data;
+ alarm_struct *l_alarm = (alarm_struct *)data;
GError *error = NULL;
gboolean status;
GtkWidget *stop;
@@ -434,44 +433,44 @@ static gboolean sound_alarm(gpointer data)
orage_message(-100, P_N);
#endif
/* note: -1 loops forever */
- if (alarm->repeat_cnt != 0) {
- if (alarm->active_alarm->sound_active) {
+ if (l_alarm->repeat_cnt != 0) {
+ if (l_alarm->active_alarm->sound_active) {
return(TRUE);
}
- status = orage_exec(alarm->sound_cmd
- , &alarm->active_alarm->sound_active, &error);
+ status = orage_exec(l_alarm->sound_cmd
+ , &l_alarm->active_alarm->sound_active, &error);
if (!status) {
- g_warning("reminder: play failed (%s)", alarm->sound);
- alarm->repeat_cnt = 0; /* one warning is enough */
+ g_warning("reminder: play failed (%s)", l_alarm->sound);
+ l_alarm->repeat_cnt = 0; /* one warning is enough */
}
- else if (alarm->repeat_cnt > 0)
- alarm->repeat_cnt--;
+ else if (l_alarm->repeat_cnt > 0)
+ l_alarm->repeat_cnt--;
}
else { /* repeat_cnt == 0 */
- if (alarm->display_orage
- && ((stop = alarm->active_alarm->stop_noise_reminder) != NULL)) {
+ if (l_alarm->display_orage
+ && ((stop = l_alarm->active_alarm->stop_noise_reminder) != NULL)) {
gtk_widget_set_sensitive(GTK_WIDGET(stop), FALSE);
}
#ifdef HAVE_NOTIFY
- if (alarm->display_notify
- && alarm->active_alarm->notify_stop_noise_action) {
+ if (l_alarm->display_notify
+ && l_alarm->active_alarm->notify_stop_noise_action) {
/* We need to remove the silence button from notify window.
* This is not nice method, but it is not possible to access
* the timeout so we just need to start it from all over */
- alarm->notify_refresh = TRUE;
- notify_notification_close(alarm->active_alarm->active_notify, NULL);
- create_notify_reminder(alarm);
+ l_alarm->notify_refresh = TRUE;
+ notify_notification_close(l_alarm->active_alarm->active_notify, NULL);
+ create_notify_reminder(l_alarm);
}
#endif
- alarm->audio = FALSE;
- alarm_free_memory(alarm);
+ l_alarm->audio = FALSE;
+ alarm_free_memory(l_alarm);
status = FALSE; /* no more alarms, end timeouts */
}
return(status);
}
-static void create_sound_reminder(alarm_struct *alarm)
+static void create_sound_reminder(alarm_struct *l_alarm)
{
#undef P_N
#define P_N "create_sound_reminder: "
@@ -479,15 +478,15 @@ static void create_sound_reminder(alarm_struct *alarm)
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- alarm->sound_cmd = g_strconcat(g_par.sound_application, " \""
- , alarm->sound, "\"", NULL);
- alarm->active_alarm->sound_active = FALSE;
- if (alarm->repeat_cnt == 0) {
- alarm->repeat_cnt++; /* need to do it once */
+ l_alarm->sound_cmd = g_strconcat(g_par.sound_application, " \""
+ , l_alarm->sound, "\"", NULL);
+ l_alarm->active_alarm->sound_active = FALSE;
+ if (l_alarm->repeat_cnt == 0) {
+ l_alarm->repeat_cnt++; /* need to do it once */
}
- g_timeout_add_seconds(alarm->repeat_delay, (GtkFunction) sound_alarm
- , (gpointer) alarm);
+ g_timeout_add_seconds(l_alarm->repeat_delay, (GtkFunction) sound_alarm
+ , (gpointer) l_alarm);
}
#ifdef HAVE_NOTIFY
@@ -495,22 +494,22 @@ static void notify_closed(NotifyNotification *n, gpointer par)
{
#undef P_N
#define P_N "notify_closed: "
- alarm_struct *alarm = (alarm_struct *)par;
+ alarm_struct *l_alarm = (alarm_struct *)par;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
/*
- g_print("notify_closed: start %d %d\n", alarm->audio, alarm->display_notify);
+ g_print("notify_closed: start %d %d\n", l_alarm->audio, l_alarm->display_notify);
*/
- if (alarm->notify_refresh) {
+ if (l_alarm->notify_refresh) {
/* this is not really closing notify, but only a refresh, so
* we do not clean the memory now */
- alarm->notify_refresh = FALSE;
+ l_alarm->notify_refresh = FALSE;
}
else {
- alarm->display_notify = FALSE; /* I am gone */
- alarm_free_memory(alarm);
+ l_alarm->display_notify = FALSE; /* I am gone */
+ alarm_free_memory(l_alarm);
}
}
@@ -519,7 +518,7 @@ static void notify_action_silence(NotifyNotification *n, const char *action
{
#undef P_N
#define P_N "notify_action_silence: "
- alarm_struct *alarm = (alarm_struct *)par;
+ alarm_struct *l_alarm = (alarm_struct *)par;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
@@ -527,13 +526,13 @@ static void notify_action_silence(NotifyNotification *n, const char *action
/* notify system will raise notify_closed also, so we need to mark that
this is not a real close, but just a refresh, so that memory is not
freed */
- alarm->notify_refresh = TRUE;
- alarm->repeat_cnt = 0; /* end sound during next play */
- create_notify_reminder(alarm); /* recreate after notify close */
+ l_alarm->notify_refresh = TRUE;
+ l_alarm->repeat_cnt = 0; /* end sound during next play */
+ create_notify_reminder(l_alarm); /* recreate after notify close */
}
#endif
-static void create_notify_reminder(alarm_struct *alarm)
+static void create_notify_reminder(alarm_struct *l_alarm)
{
#undef P_N
#define P_N "create_notify_reminder: "
@@ -551,41 +550,41 @@ static void create_notify_reminder(alarm_struct *alarm)
}
strncpy(heading, _("Reminder "), 99);
- if (alarm->title)
- g_strlcat(heading, alarm->title, 50);
- if (alarm->action_time) {
+ if (l_alarm->title)
+ g_strlcat(heading, l_alarm->title, 50);
+ if (l_alarm->action_time) {
g_strlcat(heading, "\n<b>", 10);
- g_strlcat(heading, alarm->action_time, 90);
+ g_strlcat(heading, l_alarm->action_time, 90);
g_strlcat(heading, "<\b>", 10);
}
- n = notify_notification_new(heading, alarm->description, NULL, NULL);
- alarm->active_alarm->active_notify = n;
+ n = notify_notification_new(heading, l_alarm->description, NULL, NULL);
+ l_alarm->active_alarm->active_notify = n;
if (g_par.trayIcon
&& gtk_status_icon_is_embedded((GtkStatusIcon *)g_par.trayIcon))
notify_notification_attach_to_status_icon(n
, (GtkStatusIcon *)g_par.trayIcon);
- if (alarm->notify_timeout == -1)
+ if (l_alarm->notify_timeout == -1)
notify_notification_set_timeout(n, NOTIFY_EXPIRES_NEVER);
- else if (alarm->notify_timeout == 0)
+ else if (l_alarm->notify_timeout == 0)
notify_notification_set_timeout(n, NOTIFY_EXPIRES_DEFAULT);
else
- notify_notification_set_timeout(n, alarm->notify_timeout*1000);
+ notify_notification_set_timeout(n, l_alarm->notify_timeout*1000);
- if (alarm->uid)
+ if (l_alarm->uid)
notify_notification_add_action(n, "open", _("Open")
, (NotifyActionCallback)notify_action_open
- , alarm, NULL);
- if ((alarm->audio) && (alarm->repeat_cnt > 1)) {
+ , l_alarm, NULL);
+ if ((l_alarm->audio) && (l_alarm->repeat_cnt > 1)) {
notify_notification_add_action(n, "stop", "Silence"
, (NotifyActionCallback)notify_action_silence
- , alarm, NULL);
- /* this let's sound alarm to know that we have notify active with
+ , l_alarm, NULL);
+ /* this let's sound l_alarm to know that we have notify active with
end sound button, which needs to be removed when sound ends */
- alarm->active_alarm->notify_stop_noise_action = TRUE;
+ l_alarm->active_alarm->notify_stop_noise_action = TRUE;
}
(void)g_signal_connect(G_OBJECT(n), "closed"
- , G_CALLBACK(notify_closed), alarm);
+ , G_CALLBACK(notify_closed), l_alarm);
if (!notify_notification_show(n, NULL)) {
orage_message(150, "failed to send notification");
@@ -599,13 +598,13 @@ static void destroy_orage_reminder(GtkWidget *wReminder, gpointer user_data)
{
#undef P_N
#define P_N "destroy_orage_reminder: "
- alarm_struct *alarm = (alarm_struct *)user_data;
+ alarm_struct *l_alarm = (alarm_struct *)user_data;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- alarm->display_orage = FALSE; /* I am gone */
- alarm_free_memory(alarm);
+ l_alarm->display_orage = FALSE; /* I am gone */
+ alarm_free_memory(l_alarm);
}
static void on_btStopNoiseReminder_clicked(GtkButton *button
@@ -613,12 +612,12 @@ static void on_btStopNoiseReminder_clicked(GtkButton *button
{
#undef P_N
#define P_N "on_btStopNoiseReminder_clicked: "
- alarm_struct *alarm = (alarm_struct *)user_data;
+ alarm_struct *l_alarm = (alarm_struct *)user_data;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- alarm->repeat_cnt = 0;
+ l_alarm->repeat_cnt = 0;
gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
}
@@ -638,19 +637,19 @@ static void on_btOpenReminder_clicked(GtkButton *button, gpointer user_data)
{
#undef P_N
#define P_N "on_btOpenReminder_clicked: "
- alarm_struct *alarm = (alarm_struct *)user_data;
+ alarm_struct *l_alarm = (alarm_struct *)user_data;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- create_appt_win("UPDATE", alarm->uid);
+ create_appt_win("UPDATE", l_alarm->uid);
}
-void on_btRecreateReminder_clicked(GtkButton *button, gpointer user_data)
+static void on_btRecreateReminder_clicked(GtkButton *button, gpointer user_data)
{
#undef P_N
#define P_N "on_btRecreateReminder_clicked: "
- alarm_struct *alarm = (alarm_struct *)user_data;
+ alarm_struct *l_alarm = (alarm_struct *)user_data;
orage_ddmmhh_hbox_struct *display_data;
alarm_struct *n_alarm;
time_t tt;
@@ -658,12 +657,12 @@ void on_btRecreateReminder_clicked(GtkButton *button, gpointer user_data)
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- display_data = (orage_ddmmhh_hbox_struct *)alarm->orage_display_data;
- /* we do not have alarm time here */
- n_alarm = alarm_copy(alarm, FALSE);
+ display_data = (orage_ddmmhh_hbox_struct *)l_alarm->orage_display_data;
+ /* we do not have l_alarm time here */
+ n_alarm = alarm_copy(l_alarm, FALSE);
n_alarm->temporary = TRUE;
- /* let's count new alarm time */
+ /* let's count new l_alarm time */
tt = time(NULL);
tt += (gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(display_data->spin_dd)) * 24*60*60
@@ -677,7 +676,7 @@ void on_btRecreateReminder_clicked(GtkButton *button, gpointer user_data)
gtk_widget_destroy(display_data->dialog);
}
-static void create_orage_reminder(alarm_struct *alarm)
+static void create_orage_reminder(alarm_struct *l_alarm)
{
#undef P_N
#define P_N "create_orage_reminder: "
@@ -715,14 +714,14 @@ static void create_orage_reminder(alarm_struct *alarm)
hdReminder = gtk_label_new(NULL);
gtk_label_set_selectable(GTK_LABEL(hdReminder), TRUE);
- tmp = g_markup_printf_escaped("<b>%s</b>", alarm->title);
+ tmp = g_markup_printf_escaped("<b>%s</b>", l_alarm->title);
gtk_label_set_markup(GTK_LABEL(hdReminder), tmp);
g_free(tmp);
gtk_box_pack_start(GTK_BOX(vbReminder), hdReminder, FALSE, TRUE, 0);
hdtReminder = gtk_label_new(NULL);
gtk_label_set_selectable(GTK_LABEL(hdtReminder), TRUE);
- tmp = g_markup_printf_escaped("<i>%s</i>", alarm->action_time);
+ tmp = g_markup_printf_escaped("<i>%s</i>", l_alarm->action_time);
gtk_label_set_markup(GTK_LABEL(hdtReminder), tmp);
g_free(tmp);
gtk_box_pack_start(GTK_BOX(vbReminder), hdtReminder, FALSE, TRUE, 0);
@@ -734,14 +733,14 @@ static void create_orage_reminder(alarm_struct *alarm)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swReminder)
, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- lbReminder = gtk_label_new(alarm->description);
+ lbReminder = gtk_label_new(l_alarm->description);
gtk_label_set_line_wrap(GTK_LABEL(lbReminder), TRUE);
gtk_label_set_selectable(GTK_LABEL(lbReminder), TRUE);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swReminder)
, lbReminder);
/* TIME AREA */
- ddmmhh_hbox = (orage_ddmmhh_hbox_struct *)alarm->orage_display_data;
+ ddmmhh_hbox = (orage_ddmmhh_hbox_struct *)l_alarm->orage_display_data;
ddmmhh_hbox->spin_dd = gtk_spin_button_new_with_range(0, 100, 1);
ddmmhh_hbox->spin_dd_label = gtk_label_new(_("days"));
ddmmhh_hbox->spin_hh = gtk_spin_button_new_with_range(0, 23, 1);
@@ -764,12 +763,12 @@ static void create_orage_reminder(alarm_struct *alarm)
gtk_dialog_set_has_separator(GTK_DIALOG(wReminder), FALSE);
gtk_button_box_set_layout(GTK_BUTTON_BOX(daaReminder), GTK_BUTTONBOX_END);
- if (alarm->uid) {
+ if (l_alarm->uid) {
btOpenReminder = gtk_button_new_from_stock("gtk-open");
gtk_dialog_add_action_widget(GTK_DIALOG(wReminder), btOpenReminder
, GTK_RESPONSE_OK);
g_signal_connect((gpointer) btOpenReminder, "clicked"
- , G_CALLBACK(on_btOpenReminder_clicked), alarm);
+ , G_CALLBACK(on_btOpenReminder_clicked), l_alarm);
}
btOkReminder = gtk_button_new_from_stock("gtk-close");
@@ -778,13 +777,13 @@ static void create_orage_reminder(alarm_struct *alarm)
g_signal_connect((gpointer) btOkReminder, "clicked"
, G_CALLBACK(on_btOkReminder_clicked), wReminder);
- if ((alarm->audio) && (alarm->repeat_cnt > 1)) {
+ if ((l_alarm->audio) && (l_alarm->repeat_cnt > 1)) {
btStopNoiseReminder = gtk_button_new_from_stock("gtk-stop");
- alarm->active_alarm->stop_noise_reminder = btStopNoiseReminder;
+ l_alarm->active_alarm->stop_noise_reminder = btStopNoiseReminder;
gtk_dialog_add_action_widget(GTK_DIALOG(wReminder)
, btStopNoiseReminder, GTK_RESPONSE_OK);
g_signal_connect((gpointer)btStopNoiseReminder, "clicked",
- G_CALLBACK(on_btStopNoiseReminder_clicked), alarm);
+ G_CALLBACK(on_btStopNoiseReminder_clicked), l_alarm);
}
btRecreateReminder = gtk_button_new_from_stock("gtk-execute");
@@ -799,14 +798,14 @@ static void create_orage_reminder(alarm_struct *alarm)
gtk_dialog_add_action_widget(GTK_DIALOG(wReminder)
, btRecreateReminder, GTK_RESPONSE_OK);
g_signal_connect((gpointer) btRecreateReminder, "clicked"
- , G_CALLBACK(on_btRecreateReminder_clicked), alarm);
+ , G_CALLBACK(on_btRecreateReminder_clicked), l_alarm);
g_signal_connect(G_OBJECT(wReminder), "destroy",
- G_CALLBACK(destroy_orage_reminder), alarm);
+ G_CALLBACK(destroy_orage_reminder), l_alarm);
gtk_widget_show_all(wReminder);
}
-static void create_procedure_reminder(alarm_struct *alarm)
+static void create_procedure_reminder(alarm_struct *l_alarm)
{
#undef P_N
#define P_N "create_procedure_reminder: "
@@ -821,16 +820,16 @@ static void create_procedure_reminder(alarm_struct *alarm)
orage_message(-100, P_N);
#endif
/*
- status = orage_exec(alarm->cmd, &active, &error);
+ status = orage_exec(l_alarm->cmd, &active, &error);
*/
- cmd = g_strconcat(alarm->cmd, " &", NULL);
+ cmd = g_strconcat(l_alarm->cmd, " &", NULL);
status = system(cmd);
if (status)
- g_warning(P_N "cmd failed(%s) status:%d", alarm->cmd, status);
+ g_warning(P_N "cmd failed(%s) status:%d", l_alarm->cmd, status);
g_free(cmd);
}
-void create_reminders(alarm_struct *alarm)
+void create_reminders(alarm_struct *l_alarm)
{
#undef P_N
#define P_N "create_reminders: "
@@ -839,10 +838,10 @@ void create_reminders(alarm_struct *alarm)
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- /* FIXME: instead of copying this new private version of the alarm,
- * g_list_remove(GList *g_par.alarm_list, gconstpointer alarm);
+ /* FIXME: instead of copying this new private version of the l_alarm,
+ * g_list_remove(GList *g_par.alarm_list, gconstpointer l_alarm);
* remove it and use the original. saves time */
- n_alarm = alarm_copy(alarm, TRUE);
+ n_alarm = alarm_copy(l_alarm, TRUE);
if (n_alarm->audio && n_alarm->sound)
create_sound_reminder(n_alarm);
@@ -886,9 +885,9 @@ gboolean orage_day_change(gpointer user_data)
#undef P_N
#define P_N "orage_day_change: "
struct tm *t;
- static guint previous_year=0, previous_month=0, previous_day=0;
+ static gint previous_year=0, previous_month=0, previous_day=0;
guint selected_year=0, selected_month=0, selected_day=0;
- guint current_year=0, current_month=0, current_day=0;
+ gint current_year=0, current_month=0, current_day=0;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
@@ -905,9 +904,9 @@ gboolean orage_day_change(gpointer user_data)
/* Get the selected date from calendar */
gtk_calendar_get_date(GTK_CALENDAR(((CalWin *)g_par.xfcal)->mCalendar),
&selected_year, &selected_month, &selected_day);
- if (selected_year == previous_year
- && selected_month == previous_month
- && selected_day == previous_day) {
+ if ((int)selected_year == previous_year
+ && (int)selected_month == previous_month
+ && (int)selected_day == previous_day) {
/* previous day was indeed selected,
keep it current automatically */
orage_select_date(GTK_CALENDAR(((CalWin *)g_par.xfcal)->mCalendar)
@@ -917,7 +916,7 @@ gboolean orage_day_change(gpointer user_data)
previous_month = current_month;
previous_day = current_day;
refresh_TrayIcon();
- xfical_alarm_build_list(TRUE); /* new alarm list when date changed */
+ xfical_alarm_build_list(TRUE); /* new l_alarm list when date changed */
reset_orage_day_change(TRUE); /* setup for next time */
}
else {
@@ -960,14 +959,14 @@ static gboolean orage_alarm_clock(gpointer user_data)
else /* sorted so scan can be stopped */
more_alarms = FALSE;
}
- if (alarm_raised) /* at least one alarm processed, need new list */
+ if (alarm_raised) /* at least one l_alarm processed, need new list */
xfical_alarm_build_list(FALSE); /* this calls reset_orage_alarm_clock */
else
reset_orage_alarm_clock(); /* need to setup next timer */
return(FALSE); /* only once */
}
-static void reset_orage_alarm_clock()
+static void reset_orage_alarm_clock(void)
{
#undef P_N
#define P_N "reset_orage_alarm_clock: "
@@ -991,7 +990,7 @@ static void reset_orage_alarm_clock()
cur_alarm = (alarm_struct *)alarm_l->data;
next_alarm = cur_alarm->alarm_time;
t_alarm = orage_icaltime_to_tm_time(next_alarm, FALSE);
- /* let's find out how much time we have until alarm happens */
+ /* let's find out how much time we have until l_alarm happens */
dd = orage_days_between(t, &t_alarm);
secs_to_alarm = t_alarm.tm_sec - t->tm_sec
+ 60*(t_alarm.tm_min - t->tm_min)
@@ -1118,7 +1117,7 @@ static gboolean start_orage_tooltip_update(gpointer user_data)
}
/* adjust the call to happen when minute changes */
-static gboolean reset_orage_tooltip_update()
+static gboolean reset_orage_tooltip_update(void)
{
#undef P_N
#define P_N "reset_orage_tooltip_update: "
@@ -1142,7 +1141,7 @@ static gboolean reset_orage_tooltip_update()
return(FALSE);
}
-void setup_orage_alarm_clock()
+void setup_orage_alarm_clock(void)
{
#undef P_N
#define P_N "setup_orage_alarm_clock: "
diff --git a/src/timezone_selection.c b/src/timezone_selection.c
index c35256e..79c465b 100644
--- a/src/timezone_selection.c
+++ b/src/timezone_selection.c
@@ -237,7 +237,7 @@ static gint sortEvent_comp(GtkTreeModel *model
return(ret);
}
-GtkWidget *tz_button_create_view(gboolean details, GtkTreeStore *store)
+static GtkWidget *tz_button_create_view(gboolean details, GtkTreeStore *store)
{
#undef P_N
#define P_N "tz_button_create_view: "
diff --git a/src/tray_icon.c b/src/tray_icon.c
index fb2d3b2..4d398f9 100644
--- a/src/tray_icon.c
+++ b/src/tray_icon.c
@@ -44,13 +44,12 @@
#include "event-list.h"
#include "appointment.h"
#include "parameters.h"
+#include "tray_icon.h"
#define ORAGE_TRAYICON ((GtkStatusIcon *)g_par.trayIcon)
-void orage_toggle_visible();
-
-void on_Today_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_Today_activate(GtkMenuItem *menuitem, gpointer user_data)
{
struct tm *t;
CalWin *xfcal = (CalWin *)user_data;
@@ -62,12 +61,12 @@ void on_Today_activate(GtkMenuItem *menuitem, gpointer user_data)
el = create_el_win(NULL);
}
-void on_preferences_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_preferences_activate(GtkMenuItem *menuitem, gpointer user_data)
{
show_parameters();
}
-void on_new_appointment_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_new_appointment_activate(GtkMenuItem *menuitem, gpointer user_data)
{
struct tm *t;
char cur_date[9];
@@ -78,12 +77,12 @@ void on_new_appointment_activate(GtkMenuItem *menuitem, gpointer user_data)
create_appt_win("NEW", cur_date);
}
-void on_about_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_about_activate(GtkMenuItem *menuitem, gpointer user_data)
{
create_wAbout((GtkWidget *)menuitem, user_data);
}
-void on_globaltime_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_globaltime_activate(GtkMenuItem *menuitem, gpointer user_data)
{
GError *error = NULL;
@@ -92,7 +91,7 @@ void on_globaltime_activate(GtkMenuItem *menuitem, gpointer user_data)
, error->message);
}
-gboolean button_press_cb(GtkStatusIcon *status_icon, GdkEventButton *event
+static gboolean button_press_cb(GtkStatusIcon *status_icon, GdkEventButton *event
, gpointer user_data)
{
GdkAtom atom;
@@ -129,19 +128,19 @@ gboolean button_press_cb(GtkStatusIcon *status_icon, GdkEventButton *event
return(FALSE);
}
-void toggle_visible_cb(GtkStatusIcon *status_icon, gpointer user_data)
+static void toggle_visible_cb(GtkStatusIcon *status_icon, gpointer user_data)
{
orage_toggle_visible();
}
-void show_menu(GtkStatusIcon *status_icon, guint button, guint activate_time
+static void show_menu(GtkStatusIcon *status_icon, guint button, guint activate_time
, gpointer user_data)
{
gtk_menu_popup((GtkMenu *)user_data, NULL, NULL, NULL, NULL
, button, activate_time);
}
-void create_icon_pango_layout(gint line, PangoLayout *pl, struct tm *t
+static void create_icon_pango_layout(gint line, PangoLayout *pl, struct tm *t
, gint width, gint height
, gint *x_offset, gint *y_offset, gint *y_size)
{
@@ -390,7 +389,7 @@ GdkPixbuf *orage_create_icon(gboolean static_icon, gint size)
return(pixbuf);
}
-GtkWidget *create_TrayIcon_menu()
+static GtkWidget *create_TrayIcon_menu(void)
{
CalWin *xfcal = (CalWin *)g_par.xfcal;
GtkWidget *trayMenu;
@@ -447,7 +446,7 @@ GtkWidget *create_TrayIcon_menu()
return(trayMenu);
}
-void destroy_TrayIcon(GtkStatusIcon *trayIcon)
+static void destroy_TrayIcon(GtkStatusIcon *trayIcon)
{
g_object_unref(trayIcon);
}
@@ -479,7 +478,7 @@ GtkStatusIcon* create_TrayIcon(GdkPixbuf *orage_logo)
return(trayIcon);
}
-void refresh_TrayIcon()
+void refresh_TrayIcon(void)
{
GdkPixbuf *orage_logo;
diff --git a/src/tz_zoneinfo_read.c b/src/tz_zoneinfo_read.c
index 8196df8..03091f3 100644
--- a/src/tz_zoneinfo_read.c
+++ b/src/tz_zoneinfo_read.c
@@ -154,7 +154,7 @@ static void read_file(const char *file_name, const struct stat *file_stat)
printf("read_file: end\n");
}
-static int get_long()
+static int get_long(void)
{
int tmp;
@@ -166,7 +166,7 @@ static int get_long()
return(tmp);
}
-static int process_header()
+static int process_header(void)
{
if (debug > 2)
printf("file id: %s\n", in_head);
@@ -198,10 +198,10 @@ static int process_header()
return(0);
}
-static void process_local_time_table()
+static void process_local_time_table(void)
{ /* points when time changes */
time_t tmp;
- int i;
+ unsigned int i;
begin_timechanges = in_head;
if (debug > 3)
@@ -217,10 +217,10 @@ static void process_local_time_table()
}
}
-static void process_local_time_type_table()
+static void process_local_time_type_table(void)
{ /* pointers to table, which explain how time changes */
unsigned char tmp;
- int i;
+ unsigned int i;
begin_timechangetypeindexes = in_head;
if (debug > 3)
@@ -233,11 +233,11 @@ static void process_local_time_type_table()
}
}
-static void process_ttinfo_table()
+static void process_ttinfo_table(void)
{ /* table of different time changes = types */
long tmp;
unsigned char tmp2, tmp3;
- int i;
+ unsigned int i;
begin_timechangetypes = in_head;
if (debug > 3)
@@ -254,10 +254,10 @@ static void process_ttinfo_table()
}
}
-static void process_abbr_table()
+static void process_abbr_table(void)
{
unsigned char *tmp;
- int i;
+ unsigned int i;
begin_timezonenames = in_head;
if (debug > 3)
@@ -272,10 +272,10 @@ static void process_abbr_table()
in_head += charcnt;
}
-static void process_leap_table()
+static void process_leap_table(void)
{
unsigned long tmp, tmp2;
- int i;
+ unsigned int i;
if (debug > 3)
printf("\n***** printing leap time table *****\n");
@@ -288,10 +288,10 @@ static void process_leap_table()
}
}
-static void process_std_table()
+static void process_std_table(void)
{
unsigned char tmp;
- int i;
+ unsigned int i;
if (debug > 3)
printf("\n***** printing std table *****\n");
@@ -303,10 +303,10 @@ static void process_std_table()
}
}
-static void process_gmt_table()
+static void process_gmt_table(void)
{
unsigned char tmp;
- int i;
+ unsigned int i;
if (debug > 3)
printf("\n***** printing gmt table *****\n");
@@ -324,7 +324,7 @@ static int process_file(const char *file_name)
{
if (debug > 1)
printf("\n\nprocess_file: start\n");
- if (process_header(file_name)) {
+ if (process_header()) {
if (debug > 0)
printf("File (%s) does not look like tz file. Skipping it.\n"
, file_name);
@@ -342,7 +342,7 @@ static int process_file(const char *file_name)
return(0); /* ok */
}
-static void get_country()
+static void get_country(void)
{ /* tz_array.city[tz_array.count] contains the city name.
We will find corresponding country and fill it to the table */
char *str, *str_nl, cc[4];
@@ -384,7 +384,7 @@ static void get_country()
tz_array.country[tz_array.count][(str_nl - str)] = '\0';
}
-static int timezone_exists_in_ical()
+static int timezone_exists_in_ical(void)
{ /* in_timezone_name contains the timezone name.
We will search if it exists also in the ical zones.tab file */
/* new libical checks os zone.tab file, so we need to use that if using
@@ -430,7 +430,7 @@ static int write_ical_file(const char *in_file_name
get_country();
in_head = begin_timechanges;
- for (i = 0; (i < timecnt) && (tc_time <= tt_now); i++) {
+ for (i = 0; (i < (int)timecnt) && (tc_time <= tt_now); i++) {
/* search for current time setting.
* timecnt tells how many changes we have in the tz file.
* i points to the next value to read. */
@@ -595,7 +595,7 @@ static int file_call(const char *file_name, const struct stat *sb, int flags
}
/* check the parameters and use defaults when possible */
-static int check_parameters()
+static int check_parameters(void)
{
char *s_tz, *last_tz = NULL, tz[]="/zoneinfo", tz2[]="zoneinfo/";
int tz_len, i;
@@ -728,7 +728,7 @@ static int check_parameters()
return(0); /* continue */
}
-static void read_os_timezones()
+static void read_os_timezones(void)
{
char *tz_dir, *zone_tab_file_name;
int zoneinfo_len=strlen("zoneinfo/");
@@ -780,7 +780,7 @@ static void read_os_timezones()
fclose(zone_tab_file);
}
-static void read_countries()
+static void read_countries(void)
{
char *tz_dir, *country_file_name;
int zoneinfo_len=strlen("zoneinfo/");
@@ -834,7 +834,7 @@ static void read_countries()
}
#ifndef HAVE_LIBICAL
-static void read_ical_timezones()
+static void read_ical_timezones(void)
{
FILE *zones_tab_file;
struct stat zones_tab_file_stat;
More information about the Xfce4-commits
mailing list