diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-27 04:58:27 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-27 04:58:27 +0800 |
| commit | 333656eba50f2120bbee3e817b8faf0baf448faf (patch) | |
| tree | 3869bc4847dd4ab67625b82207ff98ef19045e8d /mail/em-vfolder-rule.c | |
| parent | 1682814ef78902b385fe84589f8755b0ff4b5b5a (diff) | |
| parent | ffa17ed195a6bbb40d386fb572b7941e22f47f8d (diff) | |
| download | gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.gz gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.zst gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.zip | |
Merge branch 'warnings'
Diffstat (limited to 'mail/em-vfolder-rule.c')
| -rw-r--r-- | mail/em-vfolder-rule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index a777faaefe..bddb08f75e 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -260,7 +260,7 @@ xml_encode(FilterRule *fr) node = FILTER_RULE_CLASS(parent_class)->xml_encode(fr); g_return_val_if_fail (node != NULL, NULL); - g_return_val_if_fail (vr->with >= 0 && vr->with < sizeof(with_names)/sizeof(with_names[0]), NULL); + g_return_val_if_fail (vr->with < sizeof(with_names)/sizeof(with_names[0]), NULL); set = xmlNewNode(NULL, (const unsigned char *)"sources"); xmlAddChild(node, set); @@ -383,7 +383,7 @@ static void source_add(GtkWidget *widget, struct _source_data *data); static void source_remove(GtkWidget *widget, struct _source_data *data); static struct { - char *name; + const gchar *name; GCallback func; } edit_buttons[] = { { "source_add", G_CALLBACK(source_add) }, @@ -430,7 +430,7 @@ select_source_with_changed(GtkWidget *widget, struct _source_data *data) break; } - if ( with < EM_VFOLDER_RULE_WITH_SPECIFIC || with > EM_VFOLDER_RULE_WITH_LOCAL ) + if (with > EM_VFOLDER_RULE_WITH_LOCAL ) with = 0; gtk_widget_set_sensitive (data->source_selector, !with ); |