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/dialogs | |
| 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/dialogs')
| -rw-r--r-- | calendar/gui/dialogs/memo-page.c | 18 | ||||
| -rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 3 |
2 files changed, 2 insertions, 19 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, |