[evolution/wip/webkit2] Address some compiler warnings
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit2] Address some compiler warnings
- Date: Thu, 3 Mar 2016 15:24:12 +0000 (UTC)
commit af50cbbb06591aeedace0cfbb57641e46d9fa3fe
Author: Milan Crha <mcrha redhat com>
Date: Thu Feb 4 10:51:34 2016 +0100
Address some compiler warnings
calendar/gui/e-comp-editor-page-recurrence.c | 7 -------
calendar/gui/e-comp-editor-page-schedule.c | 2 +-
calendar/gui/ea-week-view.c | 5 ++---
e-util/e-table-item.c | 5 -----
em-format/e-mail-formatter-text-html.c | 2 +-
modules/calendar/e-calendar-preferences.c | 5 -----
plugins/publish-calendar/publish-location.h | 13 -------------
7 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/calendar/gui/e-comp-editor-page-recurrence.c b/calendar/gui/e-comp-editor-page-recurrence.c
index aad72f9..a8fa3e5 100644
--- a/calendar/gui/e-comp-editor-page-recurrence.c
+++ b/calendar/gui/e-comp-editor-page-recurrence.c
@@ -92,13 +92,6 @@ enum recur_type {
RECUR_CUSTOM
};
-static const gint type_map[] = {
- RECUR_NONE,
- RECUR_SIMPLE,
- RECUR_CUSTOM,
- -1
-};
-
static const gint freq_map[] = {
ICAL_DAILY_RECURRENCE,
ICAL_WEEKLY_RECURRENCE,
diff --git a/calendar/gui/e-comp-editor-page-schedule.c b/calendar/gui/e-comp-editor-page-schedule.c
index 1167c00..64bf70c 100644
--- a/calendar/gui/e-comp-editor-page-schedule.c
+++ b/calendar/gui/e-comp-editor-page-schedule.c
@@ -491,7 +491,7 @@ e_comp_editor_page_schedule_constructed (GObject *object)
settings = e_util_ref_settings ("org.gnome.evolution.calendar");
for (weekday = G_DATE_BAD_WEEKDAY; weekday <= G_DATE_SUNDAY; weekday++) {
- gint start_hour, start_minute, end_hour, end_minute;
+ gint start_hour = 8, start_minute = 0, end_hour = 17, end_minute = 0;
ecep_schedule_get_work_day_range_for (settings, weekday,
&start_hour, &start_minute, &end_hour, &end_minute);
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index 0946950..45ce69a 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -260,7 +260,7 @@ ea_week_view_ref_child (AtkObject *accessible,
else
continue;
- if (count == index) {
+ if (count == index) {
if (span->text_item) {
/* Not use atk_gobject_accessible_for_object for event
* text_item we need to do special thing here
@@ -268,8 +268,7 @@ ea_week_view_ref_child (AtkObject *accessible,
atk_object =
ea_calendar_helpers_get_accessible_for (
span->text_item);
- }
- else {
+ } else {
gint index;
index = (current_day != -1) ? current_day : 0;
diff --git a/e-util/e-table-item.c b/e-util/e-table-item.c
index 6c5eae1..1715b91 100644
--- a/e-util/e-table-item.c
+++ b/e-util/e-table-item.c
@@ -1782,11 +1782,6 @@ e_table_item_init (ETableItem *eti)
e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (eti), eti_reflow);
}
-#define gray50_width 2
-#define gray50_height 2
-static const gchar gray50_bits[] = {
- 0x02, 0x01, };
-
static gboolean
eti_tree_unfreeze (GtkWidget *widget,
GdkEvent *event,
diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c
index 4bb6178..147af5d 100644
--- a/em-format/e-mail-formatter-text-html.c
+++ b/em-format/e-mail-formatter-text-html.c
@@ -171,7 +171,7 @@ emfe_text_html_format (EMailFormatterExtension *extension,
if (*maybe_utf16 == (gunichar2) 0xFFFE) {
gunichar2 *ptr;
- for (ptr = maybe_utf16; i < length / 2; i++, ptr++) {
+ for (ptr = maybe_utf16, i = 0; i < length / 2; i++, ptr++) {
*ptr = GUINT16_SWAP_LE_BE (*ptr);
}
}
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index 73346e9..9e1645d 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -37,11 +37,6 @@
#define ITIP_FORMATTER_CONF_KEY_DELETE "delete-processed"
-/* same is used for Birthdays & Anniversaries calendar */
-static const gint default_reminder_units_map[] = {
- E_DURATION_MINUTES, E_DURATION_HOURS, E_DURATION_DAYS, -1
-};
-
G_DEFINE_DYNAMIC_TYPE (
ECalendarPreferences,
e_calendar_preferences,
diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h
index d93d49e..3a3af17 100644
--- a/plugins/publish-calendar/publish-location.h
+++ b/plugins/publish-calendar/publish-location.h
@@ -36,24 +36,11 @@ enum publish_frequency {
URI_PUBLISH_MANUAL
};
-static const gint publish_frequency_type_map[] = {
- URI_PUBLISH_DAILY,
- URI_PUBLISH_WEEKLY,
- URI_PUBLISH_MANUAL,
- -1,
-};
-
enum publish_format {
URI_PUBLISH_AS_ICAL,
URI_PUBLISH_AS_FB
};
-static const gint publish_format_type_mask[] = {
- URI_PUBLISH_AS_ICAL,
- URI_PUBLISH_AS_FB,
- -1
-};
-
enum FBDurationType {
FB_DURATION_DAYS,
FB_DURATION_WEEKS,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]