aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/alarm-notify
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui/alarm-notify')
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c16
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.h6
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.c28
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.h2
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c58
-rw-r--r--calendar/gui/alarm-notify/config-data.c18
-rw-r--r--calendar/gui/alarm-notify/config-data.h8
-rw-r--r--calendar/gui/alarm-notify/notify-main.c8
-rw-r--r--calendar/gui/alarm-notify/util.c16
-rw-r--r--calendar/gui/alarm-notify/util.h4
10 files changed, 82 insertions, 82 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 089bf37552..5307936b27 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -93,8 +93,8 @@ static void
an_update_minutes_label (GtkSpinButton *sb, gpointer data)
{
AlarmNotify *an;
- char *new_label;
- int snooze_timeout_min;
+ gchar *new_label;
+ gint snooze_timeout_min;
an = (AlarmNotify *) data;
@@ -108,8 +108,8 @@ static void
an_update_hrs_label (GtkSpinButton *sb, gpointer data)
{
AlarmNotify *an;
- char *new_label;
- int snooze_timeout_hrs;
+ gchar *new_label;
+ gint snooze_timeout_hrs;
an = (AlarmNotify *) data;
@@ -170,7 +170,7 @@ edit_pressed_cb (GtkButton *button, gpointer user_data)
static void
snooze_pressed_cb (GtkButton *button, gpointer user_data)
{
- int snooze_timeout;
+ gint snooze_timeout;
AlarmNotify *an = user_data;
GtkTreeIter iter;
GtkTreeModel *model = NULL;
@@ -253,7 +253,7 @@ notified_alarms_dialog_new (void)
G_TYPE_POINTER /* FuncInfo*/));
- char *gladefile;
+ gchar *gladefile;
gladefile = g_build_filename (EVOLUTION_GLADEDIR,
"alarm-notify.glade",
@@ -363,8 +363,8 @@ notified_alarms_dialog_new (void)
GtkTreeIter
add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigger,
time_t occur_start, time_t occur_end,
- ECalComponentVType vtype, const char *summary,
- const char *description, const char *location,
+ ECalComponentVType vtype, const gchar *summary,
+ const gchar *description, const gchar *location,
AlarmNotifyFunc func, gpointer func_data)
{
GtkTreeIter iter;
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
index 17f9b3a61c..ae523cb1ad 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h
@@ -43,7 +43,7 @@ struct _AlarmNotificationsDialog
GtkWidget *treeview;
};
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
+typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, gint snooze_mins, gpointer data);
AlarmNotificationsDialog *
notified_alarms_dialog_new (void);
@@ -51,8 +51,8 @@ notified_alarms_dialog_new (void);
GtkTreeIter
add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigger,
time_t occur_start, time_t occur_end,
- ECalComponentVType vtype, const char *summary,
- const char *description, const char *location,
+ ECalComponentVType vtype, const gchar *summary,
+ const gchar *description, const gchar *location,
AlarmNotifyFunc func, gpointer func_data);
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 4085815bce..e05c6e6571 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -81,7 +81,7 @@ typedef struct {
static void
process_removal_in_hash (gpointer key, gpointer value, gpointer data)
{
- char *uri = key;
+ gchar *uri = key;
ProcessRemovalsData *prd = data;
GSList *groups, *sources, *p, *q;
gboolean found = FALSE;
@@ -94,8 +94,8 @@ process_removal_in_hash (gpointer key, gpointer value, gpointer data)
sources = e_source_group_peek_sources (group);
for (q = sources; q != NULL; q = q->next) {
ESource *source = E_SOURCE (q->data);
- char *source_uri;
- const char *completion = e_source_get_property (source, "alarm");
+ gchar *source_uri;
+ const gchar *completion = e_source_get_property (source, "alarm");
source_uri = e_source_get_uri (source);
if (strcmp (source_uri, uri) == 0)
@@ -122,7 +122,7 @@ list_changed_cb (ESourceList *source_list, gpointer data)
ECalSourceType source_type = E_CAL_SOURCE_TYPE_LAST;
ProcessRemovalsData prd;
GList *l;
- int i;
+ gint i;
g_signal_handlers_block_by_func(source_list, list_changed_cb, data);
@@ -146,8 +146,8 @@ list_changed_cb (ESourceList *source_list, gpointer data)
sources = e_source_group_peek_sources (group);
for (q = sources; q != NULL; q = q->next) {
ESource *source = E_SOURCE (q->data);
- char *uri;
- const char *completion = e_source_get_property (source, "alarm");
+ gchar *uri;
+ const gchar *completion = e_source_get_property (source, "alarm");
if (completion && (!g_ascii_strcasecmp (completion, "false") ||
!g_ascii_strcasecmp (completion, "never")))
@@ -169,7 +169,7 @@ list_changed_cb (ESourceList *source_list, gpointer data)
g_hash_table_foreach (priv->uri_client_hash[source_type], (GHFunc) process_removal_in_hash, &prd);
for (l = prd.removals; l; l = l->next) {
- d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, (char *)l->data));
+ d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, (gchar *)l->data));
alarm_notify_remove_calendar (an, source_type, l->data);
}
g_list_free (prd.removals);
@@ -206,8 +206,8 @@ load_calendars (AlarmNotify *an, ECalSourceType source_type)
sources = e_source_group_peek_sources (group);
for (q = sources; q != NULL; q = q->next) {
ESource *source = E_SOURCE (q->data);
- char *uri;
- const char *completion = e_source_get_property (source, "alarm");
+ gchar *uri;
+ const gchar *completion = e_source_get_property (source, "alarm");
if (completion && (!g_ascii_strcasecmp (completion, "false") ||
!g_ascii_strcasecmp (completion, "never")))
@@ -230,7 +230,7 @@ static void
alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass)
{
AlarmNotifyPrivate *priv;
- int i;
+ gint i;
priv = g_new0 (AlarmNotifyPrivate, 1);
an->priv = priv;
@@ -263,7 +263,7 @@ alarm_notify_finalize (GObject *object)
{
AlarmNotify *an;
AlarmNotifyPrivate *priv;
- int i;
+ gint i;
g_return_if_fail (object != NULL);
g_return_if_fail (IS_ALARM_NOTIFY (object));
@@ -343,8 +343,8 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
AlarmNotifyPrivate *priv;
ECal *client;
EUri *e_uri;
- char *str_uri;
- char *pass_key;
+ gchar *str_uri;
+ gchar *pass_key;
g_return_if_fail (an != NULL);
g_return_if_fail (IS_ALARM_NOTIFY (an));
@@ -399,7 +399,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
}
void
-alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const char *str_uri)
+alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const gchar *str_uri)
{
AlarmNotifyPrivate *priv;
ECal *client;
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
index a548716295..a6ef3a173e 100644
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ b/calendar/gui/alarm-notify/alarm-notify.h
@@ -60,7 +60,7 @@ GType alarm_notify_get_type (void);
AlarmNotify *alarm_notify_new (void);
void alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource *source, gboolean load_afterwards);
-void alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const char *str_uri);
+void alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const gchar *str_uri);
ESourceList *alarm_notify_get_selected_calendars (AlarmNotify *);
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 51aad370d6..cf95c2106a 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -76,8 +76,8 @@ static GList *tray_icons_list = NULL;
/* Top Tray Image */
static GtkStatusIcon *tray_icon = NULL;
-static int tray_blink_id = -1;
-static int tray_blink_countdown = 0;
+static gint tray_blink_id = -1;
+static gint tray_blink_countdown = 0;
static AlarmNotify *an;
/* Structure that stores a client we are monitoring */
@@ -520,7 +520,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
static void
load_alarms (ClientAlarms *ca, time_t start, time_t end)
{
- char *str_query, *iso_start, *iso_end;
+ gchar *str_query, *iso_start, *iso_end;
d(printf("%s:%d (load_alarms) \n",__FILE__, __LINE__));
@@ -875,7 +875,7 @@ query_objects_removed_cb (ECal *client, GList *objects, gpointer data)
* compued with respect to the current time.
*/
static void
-create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)
+create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, gint snooze_mins)
{
QueuedAlarm *orig_qa;
time_t t;
@@ -905,8 +905,8 @@ static void
edit_component (ECal *client, ECalComponent *comp)
{
#if 0 /* KILL-BONOBO */
- const char *uid;
- const char *uri;
+ const gchar *uid;
+ const gchar *uri;
ECalSourceType source_type;
CORBA_Environment ev;
GNOME_Evolution_Calendar_CompEditorFactory factory;
@@ -939,7 +939,7 @@ edit_component (ECal *client, ECalComponent *comp)
corba_type = GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT;
}
- GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev);
+ GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (gchar *) uid, corba_type, &ev);
if (BONOBO_EX (&ev))
e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
@@ -952,9 +952,9 @@ edit_component (ECal *client, ECalComponent *comp)
}
typedef struct {
- char *summary;
- char *description;
- char *location;
+ gchar *summary;
+ gchar *description;
+ gchar *location;
gboolean blink_state;
gboolean snooze_set;
gint blink_id;
@@ -1011,7 +1011,7 @@ free_tray_icon_data (TrayIconData *tray_data)
static void
on_dialog_objs_removed_async (struct _query_msg *msg)
{
- const char *our_uid;
+ const gchar *our_uid;
GList *l;
TrayIconData *tray_data;
ECal *client;
@@ -1027,7 +1027,7 @@ on_dialog_objs_removed_async (struct _query_msg *msg)
g_return_if_fail (our_uid && *our_uid);
for (l = objects; l != NULL; l = l->next) {
- const char *uid = l->data;
+ const gchar *uid = l->data;
if (!uid)
continue;
@@ -1199,7 +1199,7 @@ tray_list_remove_data (TrayIconData *data)
}
static void
-notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
+notify_dialog_cb (AlarmNotifyResult result, gint snooze_mins, gpointer data)
{
TrayIconData *tray_data = data;
@@ -1439,11 +1439,11 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
{
QueuedAlarm *qa;
ECalComponent *comp;
- const char *summary, *description, *location;
+ const gchar *summary, *description, *location;
TrayIconData *tray_data;
ECalComponentText text;
GSList *text_list;
- char *str, *start_str, *end_str, *alarm_str, *time_str;
+ gchar *str, *start_str, *end_str, *alarm_str, *time_str;
icaltimezone *current_zone;
ECalComponentOrganizer organiser;
@@ -1523,7 +1523,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
tray_list_add_new (tray_data);
if (g_list_length (tray_icons_list) > 1) {
- char *tip;
+ gchar *tip;
tip = g_strdup_printf (_("You have %d alarms"), g_list_length (tray_icons_list));
gtk_status_icon_set_tooltip_text (tray_icon, tip);
@@ -1561,13 +1561,13 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
{
QueuedAlarm *qa;
ECalComponent *comp;
- const char *summary, *location;
+ const gchar *summary, *location;
ECalComponentText text;
- char *str, *start_str, *end_str, *alarm_str, *time_str;
+ gchar *str, *start_str, *end_str, *alarm_str, *time_str;
icaltimezone *current_zone;
ECalComponentOrganizer organiser;
NotifyNotification *n;
- char *body;
+ gchar *body;
d(printf("%s:%d (popup_notification)\n",__FILE__, __LINE__));
@@ -1654,7 +1654,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
e_cal_component_alarm_free (alarm);
if (attach && icalattach_get_is_url (attach)) {
- const char *url;
+ const gchar *url;
url = icalattach_get_url (attach);
@@ -1704,11 +1704,11 @@ mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)
/* Performs notification of a procedure alarm */
static gboolean
-procedure_notification_dialog (const char *cmd, const char *url)
+procedure_notification_dialog (const gchar *cmd, const gchar *url)
{
GtkWidget *dialog, *label, *checkbox;
- char *str;
- int btn;
+ gchar *str;
+ gint btn;
d(printf("%s:%d (procedure_notification_dialog)\n",__FILE__, __LINE__));
@@ -1757,8 +1757,8 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id
ECalComponentAlarm *alarm;
ECalComponentText description;
icalattach *attach;
- const char *url;
- char *cmd;
+ const gchar *url;
+ gchar *cmd;
gboolean result = TRUE;
d(printf("%s:%d (procedure_notification)\n",__FILE__, __LINE__));
@@ -1791,12 +1791,12 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id
if (description.value)
cmd = g_strconcat (url, " ", description.value, NULL);
else
- cmd = (char *) url;
+ cmd = (gchar *) url;
if (procedure_notification_dialog (cmd, url))
result = g_spawn_command_line_async (cmd, NULL);
- if (cmd != (char *) url)
+ if (cmd != (gchar *) url)
g_free (cmd);
icalattach_unref (attach);
@@ -2170,7 +2170,7 @@ update_cqa (CompQueuedAlarms *cqa, ECalComponent *newcomp)
/* Update auids in Queued Alarms*/
for (qa_list = cqa->queued_alarms; qa_list; qa_list = qa_list->next) {
QueuedAlarm *qa = qa_list->data;
- char *check_auid = (char *) qa->instance->auid;
+ gchar *check_auid = (gchar *) qa->instance->auid;
ECalComponentAlarm *alarm;
alarm = e_cal_component_get_alarm (newcomp, check_auid);
@@ -2209,7 +2209,7 @@ update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa)
for (instance_list = alarms->alarms; instance_list; instance_list = instance_list->next) {
al_inst = instance_list->data;
if (al_inst->trigger == qa->orig_trigger) { /* FIXME if two or more alarm instances (audio, note) for same component have same trigger */
- g_free ((char *) qa->instance->auid);
+ g_free ((gchar *) qa->instance->auid);
qa->instance->auid = g_strdup (al_inst->auid);
break;
}
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index dba9099520..8f3b0aebc1 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -48,7 +48,7 @@ static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL;
static gboolean
locale_supports_12_hour_format (void)
{
- char s[16];
+ gchar s[16];
time_t t = 0;
strftime (s, sizeof s, "%p", gmtime (&t));
@@ -100,7 +100,7 @@ ensure_inited (void)
}
ESourceList *
-config_data_get_calendars (const char *key)
+config_data_get_calendars (const gchar *key)
{
ESourceList *cal_sources;
gboolean state;
@@ -157,9 +157,9 @@ config_data_get_calendars (const char *key)
}
void
-config_data_replace_string_list (const char *key,
- const char *old,
- const char *new)
+config_data_replace_string_list (const gchar *key,
+ const gchar *old,
+ const gchar *new)
{
GSList *source, *tmp;
@@ -204,7 +204,7 @@ config_data_get_conf_client (void)
icaltimezone *
config_data_get_timezone (void)
{
- char *location;
+ gchar *location;
icaltimezone *local_timezone;
ensure_inited ();
@@ -309,7 +309,7 @@ config_data_get_last_notification_time (void)
* Saves a program name as "blessed"
**/
void
-config_data_save_blessed_program (const char *program)
+config_data_save_blessed_program (const gchar *program)
{
GConfClient *client;
GSList *l;
@@ -333,7 +333,7 @@ config_data_save_blessed_program (const char *program)
* Return value: TRUE if program is blessed, FALSE otherwise
**/
gboolean
-config_data_is_blessed_program (const char *program)
+config_data_is_blessed_program (const gchar *program)
{
GConfClient *client;
GSList *l, *n;
@@ -346,7 +346,7 @@ config_data_is_blessed_program (const char *program)
while (l) {
n = l->next;
if (!found)
- found = strcmp ((char *) l->data, program) == 0;
+ found = strcmp ((gchar *) l->data, program) == 0;
g_free (l->data);
g_slist_free_1 (l);
l = n;
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index 63e6c7205e..19086beb56 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -38,9 +38,9 @@ gboolean config_data_get_24_hour_format (void);
gboolean config_data_get_notify_with_tray (void);
void config_data_set_last_notification_time (time_t t);
time_t config_data_get_last_notification_time (void);
-void config_data_save_blessed_program (const char *program);
-gboolean config_data_is_blessed_program (const char *program);
-ESourceList *config_data_get_calendars (const char *);
-void config_data_replace_string_list (const char *, const char *, const char *);
+void config_data_save_blessed_program (const gchar *program);
+gboolean config_data_is_blessed_program (const gchar *program);
+ESourceList *config_data_get_calendars (const gchar *);
+void config_data_replace_string_list (const gchar *, const gchar *, const gchar *);
#endif
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index a625bec0fa..887adaa1d5 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -67,7 +67,7 @@ static gint
save_session_cb (GnomeClient *client, GnomeSaveStyle save_style, gint shutdown,
GnomeInteractStyle interact_style, gint fast, gpointer user_data)
{
- char *args[2];
+ gchar *args[2];
args[0] = g_build_filename (EVOLUTION_LIBEXECDIR,
"evolution-alarm-notify"
@@ -110,7 +110,7 @@ init_session (void)
* singleton service object.
*/
static BonoboObject *
-alarm_notify_factory_fn (BonoboGenericFactory *factory, const char *component_id, void *data)
+alarm_notify_factory_fn (BonoboGenericFactory *factory, const gchar *component_id, gpointer data)
{
g_return_val_if_fail (alarm_notify_service != NULL, NULL);
@@ -127,8 +127,8 @@ init_alarm_service (gpointer user_data)
return FALSE;
}
-int
-main (int argc, char **argv)
+gint
+main (gint argc, gchar **argv)
{
bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 640a8f5f99..5377c8d4b2 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -33,12 +33,12 @@
#include "util.h"
/* Converts a time_t to a string, relative to the specified timezone */
-char *
+gchar *
timet_to_str_with_zone (time_t t, icaltimezone *zone)
{
struct icaltimetype itt;
struct tm tm;
- char buf[256];
+ gchar buf[256];
if (t == -1)
return g_strdup (_("invalid time"));
@@ -51,15 +51,15 @@ timet_to_str_with_zone (time_t t, icaltimezone *zone)
return g_strdup (buf);
}
-char *
+gchar *
calculate_time (time_t start, time_t end)
{
time_t difference = end - start;
- char *str;
- int hours, minutes;
- char *times[4];
- char *joined;
- int i;
+ gchar *str;
+ gint hours, minutes;
+ gchar *times[4];
+ gchar *joined;
+ gint i;
i = 0;
if (difference >= 3600) {
diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h
index b7b715ca9b..bb6935729a 100644
--- a/calendar/gui/alarm-notify/util.h
+++ b/calendar/gui/alarm-notify/util.h
@@ -28,6 +28,6 @@
#include <libecal/e-cal-component.h>
-char *timet_to_str_with_zone (time_t t, icaltimezone *zone);
-char *calculate_time (time_t start, time_t end);
+gchar *timet_to_str_with_zone (time_t t, icaltimezone *zone);
+gchar *calculate_time (time_t start, time_t end);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 08:59:25 +0800