diff options
| -rw-r--r-- | filter/ChangeLog | 11 | ||||
| -rw-r--r-- | filter/filter-file.c | 1 | ||||
| -rw-r--r-- | filter/filter-part.c | 3 | ||||
| -rw-r--r-- | filter/filter-rule.c | 4 | ||||
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-filter-rule.c | 4 |
6 files changed, 24 insertions, 6 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index adc477e403..ccbe4b0e11 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,5 +1,16 @@ 2007-09-12 Milan Crha <mcrha@redhat.com> + ** Fix for bug #473514 + + * filter-part.c: (filter_part_get_widget): + Allow expand and fill free space to FilterFile. + * filter-rule.c: (option_activate), (get_rule_part_widget): + Allow rule part fill space if requested. + + * filter-file.c: (get_widget): Fixed runtime warning. + +2007-09-12 Milan Crha <mcrha@redhat.com> + ** Fix for bug #231178 * filter-label.c: (xml_create): diff --git a/filter/filter-file.c b/filter/filter-file.c index 3da12024ab..1c7a76a180 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -294,7 +294,6 @@ get_widget (FilterElement *fe) #ifdef USE_GTKFILECHOOSER filewidget = (GtkWidget *) gtk_file_chooser_button_new (_("Choose a file"), GTK_FILE_CHOOSER_ACTION_OPEN); - g_object_set (G_OBJECT (filewidget), "use_filechooser", TRUE, NULL); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewidget), file->path); g_signal_connect (GTK_FILE_CHOOSER_BUTTON (filewidget), "selection-changed", G_CALLBACK (filename_changed), fe); diff --git a/filter/filter-part.c b/filter/filter-part.c index 30a5671c4a..6ac8ddd842 100644 --- a/filter/filter-part.c +++ b/filter/filter-part.c @@ -34,6 +34,7 @@ #include "filter-part.h" #include "rule-context.h" +#include "filter-file.h" #define d(x) @@ -348,7 +349,7 @@ filter_part_get_widget (FilterPart *ff) fe = l->data; w = filter_element_get_widget (fe); if (w) - gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 3); + gtk_box_pack_start (GTK_BOX (hbox), w, IS_FILTER_FILE (fe), IS_FILTER_FILE (fe), 3); l = g_list_next (l); } diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 9dba4ddf10..9e2c79f10c 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -623,7 +623,7 @@ option_activate (GtkMenuItem *item, struct _part_data *data) data->part = newpart; data->partwidget = filter_part_get_widget (newpart); if (data->partwidget) - gtk_box_pack_start (GTK_BOX (data->container), data->partwidget, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (data->container), data->partwidget, TRUE, TRUE, 0); g_object_set_data ((GObject *) data->container, "part", newpart); } @@ -675,7 +675,7 @@ get_rule_part_widget (RuleContext *f, FilterPart *newpart, FilterRule *fr) gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 0); if (p) - gtk_box_pack_start (GTK_BOX (hbox), p, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), p, TRUE, TRUE, 0); gtk_widget_show_all (hbox); diff --git a/mail/ChangeLog b/mail/ChangeLog index 774175b9a8..c69ffcc491 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,12 @@ 2007-09-12 Milan Crha <mcrha@redhat.com> + ** Fix for bug #473514 + + * em-filter-rule.c: (option_activate), (get_rule_part_widget): + Allow rule part fill space if requested. + +2007-09-12 Milan Crha <mcrha@redhat.com> + ** Fix for bug #231178 * filtertypes.xml: Added 'label' filtertype to the list. diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 9ebceddf14..5c74cc8cf5 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -344,7 +344,7 @@ option_activate(GtkMenuItem *item, struct _part_data *data) data->part = newpart; data->partwidget = filter_part_get_widget(newpart); if (data->partwidget) - gtk_box_pack_start(GTK_BOX(data->container), data->partwidget, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(data->container), data->partwidget, TRUE, TRUE, 0); g_object_set_data((GObject *)data->container, "part", newpart); } @@ -394,7 +394,7 @@ get_rule_part_widget(EMFilterContext *f, FilterPart *newpart, FilterRule *fr) gtk_box_pack_start(GTK_BOX(hbox), omenu, FALSE, FALSE, 0); if (p) - gtk_box_pack_start(GTK_BOX(hbox), p, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), p, TRUE, TRUE, 0); gtk_widget_show_all(hbox); |