aboutsummaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-04-29 09:38:15 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-04-29 09:38:15 +0800
commit9192f0dc883acfaff0fbe3f6a7f8e49672546a02 (patch)
tree2184176417efab7fc754de058d5739bec0468fc1 /filter
parent0b04c6cfd743afcf5a4e6a195a120776074cb2a7 (diff)
parentc868ace2e93942aef027085353bff2bd736584b3 (diff)
downloadgsoc2013-evolution-9192f0dc883acfaff0fbe3f6a7f8e49672546a02.tar.gz
gsoc2013-evolution-9192f0dc883acfaff0fbe3f6a7f8e49672546a02.tar.zst
gsoc2013-evolution-9192f0dc883acfaff0fbe3f6a7f8e49672546a02.zip
Merge branch 'master' into kill-bonobo
Conflicts: a11y/widgets/Makefile.am a11y/widgets/ea-widgets.c a11y/widgets/ea-widgets.h addressbook/gui/component/addressbook-component.c calendar/gui/Makefile.am calendar/gui/calendar-component.c calendar/gui/dialogs/comp-editor.c calendar/gui/dialogs/event-editor.c calendar/gui/dialogs/memo-editor.c calendar/gui/dialogs/task-editor.c calendar/gui/memos-component.c calendar/gui/tasks-component.c composer/e-composer-private.c composer/e-msg-composer.c configure.in e-util/e-plugin-ui.c e-util/e-plugin-ui.h mail/ChangeLog mail/Makefile.am mail/e-mail-attachment-bar.c mail/em-format-html-display.c mail/em-format-html-display.h mail/em-format-html.h mail/em-format.h mail/em-popup.c mail/mail-component.c plugins/external-editor/external-editor.c widgets/misc/Makefile.am widgets/misc/e-attachment-paned.c widgets/misc/e-attachment-view.c widgets/misc/e-attachment.c
Diffstat (limited to 'filter')
-rw-r--r--filter/ChangeLog7
-rw-r--r--filter/filter-option.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 656210ddce..daf8946e76 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-28 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #572348
+
+ * filter-option.c: (combobox_changed), (get_widget):
+ Fix breakage of filter options.
+
2009-04-24 Milan Crha <mcrha@redhat.com>
** Fix for bug #572348
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 3b93084d67..7c5bbe901c 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -346,7 +346,7 @@ combobox_changed (GtkWidget *widget, FilterElement *fe)
{
FilterOption *fo = (FilterOption *)fe;
- fo->current = (struct _filter_option *) g_list_nth (fo->options, gtk_combo_box_get_active (GTK_COMBO_BOX (widget)));
+ fo->current = (struct _filter_option *) g_list_nth_data (fo->options, gtk_combo_box_get_active (GTK_COMBO_BOX (widget)));
}
static GSList *
@@ -439,6 +439,9 @@ get_widget (FilterElement *fe)
op = l->data;
gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _(op->title));
+ if (op == fo->current)
+ current = index;
+
l = g_list_next (l);
index++;
}