diff options
author | Kjartan Maraas <kmaraas@gnome.org> | 2011-02-09 00:57:50 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-02-09 00:57:50 +0800 |
commit | 2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec (patch) | |
tree | e311c2818c68f66126ee6879abd4a080b4b7ad6f /calendar/gui | |
parent | eef8eda70ed8f716eeaae7dd8d9c81640b0dd4f8 (diff) | |
download | gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.gz gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.bz2 gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.lz gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.xz gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.zst gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.zip |
Bug 641756 - Fix warnings from GCC 4.6
GCC learned how to find dead assignments.
Diffstat (limited to 'calendar/gui')
-rw-r--r-- | calendar/gui/dialogs/memo-page.c | 18 | ||||
-rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 3 | ||||
-rw-r--r-- | calendar/gui/e-day-view.c | 2 | ||||
-rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 2 | ||||
-rw-r--r-- | calendar/gui/e-week-view.c | 2 |
5 files changed, 2 insertions, 25 deletions
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 414b644d0c..03cf7e7b95 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -639,40 +639,26 @@ memo_page_fill_component (CompEditorPage *page, e_cal_component_set_description_list (comp, NULL); } else { - gint idxToUse = 1; GSList l; - ECalComponentText text, sumText; - gchar *txt, *p; + ECalComponentText text; + gchar *p; gunichar uc; for (i = 0, p = str, uc = g_utf8_get_char_validated (p, -1); i < 50 && p && uc < (gunichar)-2; i++, p = g_utf8_next_char (p), uc = g_utf8_get_char_validated (p, -1)) { - idxToUse = p - str; if (uc == '\n' || !uc) { p = NULL; break; } } - if (p) - idxToUse = p - str; - - if (i == 50 && uc && uc < (gunichar)-2) - sumText.value = txt = g_strdup_printf ("%.*s...", idxToUse, str); - else - sumText.value = txt = g_strndup (str, idxToUse); - - sumText.altrep = NULL; - text.value = str; text.altrep = NULL; l.data = &text; l.next = NULL; e_cal_component_set_description_list (comp, &l); - - g_free (txt); } if (str) diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index a0be04810b..e8deefae36 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -2096,13 +2096,10 @@ create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget ** { RecurrencePagePrivate *priv; GtkWidget *dialog, *toplevel; - CompEditor *editor; GtkWidget *container; priv = rpage->priv; - editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage)); - toplevel = gtk_widget_get_toplevel (priv->main); dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (toplevel), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 52d34f511e..8ce7481809 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1344,13 +1344,11 @@ static void e_day_view_realize (GtkWidget *widget) { EDayView *day_view; - GdkWindow *window; if (GTK_WIDGET_CLASS (e_day_view_parent_class)->realize) (*GTK_WIDGET_CLASS (e_day_view_parent_class)->realize)(widget); day_view = E_DAY_VIEW (widget); - window = gtk_widget_get_window (widget); /* Allocate the colors. */ diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index ef221c4288..7e405d1f36 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -1067,14 +1067,12 @@ static void e_meeting_time_selector_realize (GtkWidget *widget) { EMeetingTimeSelector *mts; - GdkWindow *window; if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->realize) (*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->realize)(widget); mts = E_MEETING_TIME_SELECTOR (widget); - window = gtk_widget_get_window (widget); mts->no_info_pattern = e_meeting_time_selector_create_no_info_pattern (mts); } diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 560ed09343..bfe7cd20e9 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -913,13 +913,11 @@ static void e_week_view_realize (GtkWidget *widget) { EWeekView *week_view; - GdkWindow *window; if (GTK_WIDGET_CLASS (e_week_view_parent_class)->realize) (*GTK_WIDGET_CLASS (e_week_view_parent_class)->realize)(widget); week_view = E_WEEK_VIEW (widget); - window = gtk_widget_get_window (widget); /* Allocate the colors. */ e_week_view_set_colors (week_view, widget); |