aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog35
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.c2
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.glade3
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c4
-rw-r--r--calendar/gui/calendar-config.c5
-rw-r--r--calendar/gui/calendar-config.h2
-rw-r--r--calendar/gui/dialogs/alarm-dialog.c2
-rw-r--r--calendar/gui/dialogs/event-page.c4
-rw-r--r--calendar/gui/dialogs/task-details-page.c2
-rw-r--r--calendar/gui/dialogs/task-page.c2
-rw-r--r--calendar/gui/e-day-view.c8
-rw-r--r--calendar/gui/e-itip-control.c2
-rw-r--r--calendar/gui/e-week-view.c8
-rw-r--r--calendar/gui/gnome-cal.c2
-rw-r--r--calendar/gui/memos-component.c1
15 files changed, 57 insertions, 25 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a52a0faeb6..f7d47c8ce9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,38 @@
+2009-02-13 Chow Loong Jin <hyperair@gmail.com>
+
+ ** Fixes bug #571625
+
+ * calendar/gui/e-day-view.c
+ * calendar/gui/e-week-view.c:
+ Use black/white for foreground instead of active/inactive text color
+
+2009-02-11 Andre Klapper <a9016009@gmx.de>
+
+ * /gui/migration.c:
+ * /gui/dialogs/alarm-dialog.c:
+ Substitute some deprecated gtk+ functions.
+
+2009-02-09 Milan Crha <mcrha@redhat.com>
+
+ * gui/dialogs/cal-prefs-dialog.glade:
+ Do not use non-zero page size in an adjustment, it's deprecated now.
+
+2009-02-03 Gabor Kelemen <kelemeng@gnome.hu>
+
+ * gui/alarm-notify/alarm-notify.glade:
+ Mark a string for translation. Fixes bug #570364
+
+2009-02-01 Matthew Barnes <mbarnes@redhat.com>
+
+ * gui/calendar-config.c:
+ * gui/calendar-config.h:
+ * gui/e-itip-control.c:
+ * gui/alarm-notify/alarm-queue.c:
+ * gui/dialogs/event-page.c:
+ * gui/dialogs/task-details-page.c:
+ * gui/dialogs/task-page.c:
+ Fix compiler warnings.
+
2009-01-30 Suman Manjunath <msuman@novell.com>
** Fix for bug #450554 (bugzilla.novell.com)
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index fb29f7f7d8..7afa854426 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -46,7 +46,7 @@ struct _AlarmNotifyPrivate {
GMutex *mutex;
};
-#define d(x) x
+#define d(x)
static void alarm_notify_class_init (AlarmNotifyClass *klass);
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
index 9c2993d474..d65ed5efe6 100644
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ b/calendar/gui/alarm-notify/alarm-notify.glade
@@ -79,7 +79,8 @@
<child>
<widget class="GtkLabel" id="label19">
<property name="visible">True</property>
- <property name="label">Dismiss _All</property>
+ <property name="label"
+translatable="yes">Dismiss _All</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 77a5574157..bb7508fbcd 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -57,7 +57,7 @@
-#define d(x) x
+#define d(x)
/* The dialog with alarm nofications */
static AlarmNotificationsDialog *alarm_notifications_dialog = NULL;
@@ -477,7 +477,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
ECalComponentAlarmInstance *instance;
gpointer alarm_id;
QueuedAlarm *qa;
- time_t tnow = time(NULL);
+ d(time_t tnow = time(NULL));
instance = l->data;
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index b5928b6523..2459885b8d 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -244,7 +244,8 @@ calendar_config_get_icaltimezone (void)
icalproperty *tz_prop, *offset_to;
icaltimezone *st_zone = NULL;
int offset;
- char *n_tzid, *tzid;
+ const char *tzid;
+ char *n_tzid;
tzid = icaltimezone_get_tzid (zone);
n_tzid = g_strconcat (tzid, "-(Standard)", NULL);
@@ -296,7 +297,7 @@ calendar_config_get_icaltimezone (void)
/* Sets the timezone. If set to NULL it defaults to UTC.
FIXME: Should check it is being set to a valid timezone. */
void
-calendar_config_set_timezone (gchar *timezone)
+calendar_config_set_timezone (const gchar *timezone)
{
calendar_config_init ();
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 0d79d2050c..f5fe75bf15 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -76,7 +76,7 @@ guint calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc
/* The current timezone, e.g. "Europe/London". */
gchar* calendar_config_get_timezone (void);
icaltimezone *calendar_config_get_icaltimezone (void);
-void calendar_config_set_timezone (gchar *timezone);
+void calendar_config_set_timezone (const gchar *timezone);
guint calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data);
/* The working days of the week, a bit-wise combination of flags. */
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index bf78f70011..2f1393d70f 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -863,7 +863,7 @@ setup_select_names (Dialog *dialog)
dialog->malarm_addresses =
GTK_WIDGET (e_name_selector_peek_section_entry (dialog->name_selector, section_name));
gtk_widget_show (dialog->malarm_addresses);
- gtk_box_pack_end_defaults (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses);
+ gtk_box_pack_end (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses, TRUE, TRUE, 0);
g_signal_connect (G_OBJECT (dialog->malarm_addressbook), "clicked",
G_CALLBACK (addressbook_clicked_cb), dialog);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 2faed38a39..1f09663c53 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1490,14 +1490,14 @@ event_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
if (zone) {
if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
- g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+ g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
}
/* add end date timezone */
zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
if (zone) {
if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
- g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+ g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
}
return TRUE;
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 81358901ba..8212864a31 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -430,7 +430,7 @@ task_details_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
zone = icaltimezone_get_utc_timezone ();
if (zone) {
if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
- g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+ g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
}
return TRUE;
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index b81119c5cf..88b753b9db 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1348,7 +1348,7 @@ task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
if (zone) {
if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
- g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+ g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
}
return TRUE;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 5bb7850020..d1ffb986de 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1238,7 +1238,7 @@ e_day_view_unrealize (GtkWidget *widget)
static GdkColor
e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *widget)
{
- GdkColor color, bg_color;
+ GdkColor bg_color;
guint16 red, green, blue;
gdouble cc = 65535.0;
@@ -1258,11 +1258,9 @@ e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *
}
if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
- color = widget->style->text[GTK_STATE_NORMAL];
+ return widget->style->black;
else
- color = widget->style->text[GTK_STATE_ACTIVE];
-
- return color;
+ return widget->style->white;
}
static void
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 03001cc3d9..0583a4fefe 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -661,7 +661,7 @@ write_label_piece (EItipControl *itip, ECalComponentDateTime *dt,
struct tm tmp_tm;
char time_buf[64];
icaltimezone *zone = NULL;
- char *display_name;
+ const char *display_name;
priv = itip->priv;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 8614141b6e..290a6831ed 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -817,7 +817,7 @@ get_digit_width (PangoLayout *layout)
static GdkColor
e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidget *widget)
{
- GdkColor color, bg_color;
+ GdkColor bg_color;
guint16 red, green, blue;
gdouble cc = 65535.0;
@@ -837,11 +837,9 @@ e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidg
}
if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
- color = widget->style->text[GTK_STATE_NORMAL];
+ return widget->style->black;
else
- color = widget->style->text[GTK_STATE_ACTIVE];
-
- return color;
+ return widget->style->white;
}
static void
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index d918c18a11..4db534611d 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -84,7 +84,7 @@
#define G_MAXINT32 ((gint32) 0x7fffffff)
#endif
-#define d(x) x
+#define d(x)
/* hash table define for non intrusive error dialog */
static GHashTable *non_intrusive_error_table = NULL;
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 803a784453..9a2b9df46e 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -91,7 +91,6 @@ struct _MemosComponentPrivate {
GList *notifications;
};
-/* #define d(x) x */
#define d(x)
/* Utility functions. */
generated by cgit (git 2.34.1) at 2024-11-17 05:14:49 +0800