diff options
author | Pavel Cisler <pavel@eazel.com> | 2000-09-05 20:38:10 +0000 |
---|---|---|
committer | Pavel Cisler <pce@src.gnome.org> | 2000-09-05 20:38:10 +0000 |
commit | add783964b40df9dcae367f7ee3985c00e48cf8e (patch) | |
tree | 5d687872f47da87a4da2892d97288040261f5ed7 /src/nautilus-search-bar-criterion.c | |
parent | 1b18a656209f630d30bc0e68eb8842950644e6ba (diff) | |
download | nautilus-add783964b40df9dcae367f7ee3985c00e48cf8e.tar.gz |
Fix all the warnings -Wuninitialized found. Quite a number of them were
2000-09-05 Pavel Cisler <pavel@eazel.com>
* components/help/converters/gnome-db2html2/gdb3html.c:
(xml_parse_document):
* components/help/hyperbola-nav-index.c: (end_element):
* components/services/summary/nautilus-view/nautilus-summary-view.c
: (logout_button_cb):
* components/services/time/service/trilobite-eazel-time-service.c:
(trilobite_eazel_time_service_do_http_request):
* components/tree/nautilus-tree-view.c:
* configure.in:
* libnautilus-extensions/bonobo-stream-vfs.c:
(bonobo_stream_vfs_open):
* libnautilus-extensions/nautilus-background.c:
(nautilus_background_draw), (nautilus_background_draw_aa):
* libnautilus-extensions/nautilus-customization-data.c:
(nautilus_customization_data_new):
* libnautilus-extensions/nautilus-directory-background.c:
(nautilus_directory_background_write_desktop_settings):
* libnautilus-extensions/nautilus-file-operations.c:
(nautilus_file_operations_move_to_trash), (do_empty_trash):
* libnautilus-extensions/nautilus-file.c: (nautilus_file_dump):
* libnautilus-extensions/nautilus-icon-canvas-item.c:
(draw_or_measure_label_text), (emblem_layout_next):
* libnautilus-extensions/nautilus-icon-factory.c:
(get_image_from_cache):
* libnautilus-extensions/nautilus-icon-text-item.c:
(iti_paint_text):
* libnautilus-extensions/nautilus-list.c: (draw_cell), (draw_row):
* libnautilus-extensions/nautilus-mime-actions.c:
(nautilus_mime_add_application_to_short_list_for_uri):
* libnautilus-extensions/nautilus-program-chooser.c:
(program_file_pair_get_short_status_text),
(program_file_pair_get_long_status_text):
* libnautilus-extensions/nautilus-program-choosing.c:
(nautilus_choose_component_for_file),
(nautilus_choose_application_for_file):
* libnautilus-extensions/nautilus-scalable-font.c:
(nautilus_scalable_font_draw_text_lines_with_dimensions):
* libnautilus-extensions/nautilus-theme.c:
(nautilus_theme_make_selector):
* librsvg/rsvg-ft.c: (rsvg_ft_get_glyph):
* librsvg/test-ft-gtk.c: (set_text):
* librsvg/test-ft.c: (save_pixbuf_to_file_internal),
(save_pixbuf_to_file):
* librsvg/test-rsvg.c: (save_pixbuf_to_file_internal),
(save_pixbuf_to_file):
* src/file-manager/fm-directory-view.c: (display_pending_files),
(compute_menu_item_info):
* src/file-manager/fm-icon-view.c: (compute_menu_item_info):
* src/file-manager/fm-list-view.c: (get_column_from_attribute):
* src/nautilus-application.c: (nautilus_application_startup):
* src/nautilus-search-bar-criterion.c:
(nautilus_search_bar_criterion_next_new),
(nautilus_search_bar_criterion_get_location),
(get_date_modified_location_for):
* src/nautilus-sidebar-tabs.c: (draw_one_tab_themed),
(draw_or_layout_all_tabs):
* src/nautilus-toolbar.c: (nautilus_toolbar_size_allocate):
* src/nautilus-window-manage-views.c:
(nautilus_window_get_current_location_title):
* test/test-nautilus-label.c: (justification_changed_callback):
Fix all the warnings -Wuninitialized found.
Quite a number of them were actual bugs.
Turn on -Wuninitialized in configure.in now that ORBit generates
warning-free code.
Diffstat (limited to 'src/nautilus-search-bar-criterion.c')
-rw-r--r-- | src/nautilus-search-bar-criterion.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c index 7df2f0947..352f3a229 100644 --- a/src/nautilus-search-bar-criterion.c +++ b/src/nautilus-search-bar-criterion.c @@ -384,6 +384,7 @@ nautilus_search_bar_criterion_next_new (NautilusSearchBarCriterionType criterion NULL); break; default: + new_criterion = NULL; g_assert_not_reached (); } @@ -411,7 +412,9 @@ nautilus_search_bar_criterion_get_location (NautilusSearchBarCriterion *criterio GtkWidget *menu_item; int name_number, relation_number, value_number; char *value_text; - + + value_number = 0; + value_text = NULL; /* There is ONE thing you should be aware of while implementing this function. You have to make sure you use non-translated strings for building the uri. So, to implement this, you are supposed to: @@ -433,22 +436,23 @@ nautilus_search_bar_criterion_get_location (NautilusSearchBarCriterion *criterio menu = gtk_option_menu_get_menu (criterion->details->value_menu); menu_item = gtk_menu_get_active (GTK_MENU (menu)); value_number = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menu_item), "type")); - } - else if (criterion->details->use_value_entry) { + } else if (criterion->details->use_value_entry) { value_text = gtk_entry_get_text (GTK_ENTRY (criterion->details->value_entry)); - } - else if (criterion->details->type == NAUTILUS_DATE_MODIFIED_SEARCH_CRITERION) { + } else if (criterion->details->type == NAUTILUS_DATE_MODIFIED_SEARCH_CRITERION) { value_text = nautilus_gnome_date_edit_get_date_as_string (criterion->details->date); } switch (name_number) { case NAUTILUS_FILE_NAME_SEARCH_CRITERION: + g_assert (criterion->details->use_value_entry + || criterion->details->type == NAUTILUS_DATE_MODIFIED_SEARCH_CRITERION); return get_name_location_for (relation_number, value_text); case NAUTILUS_CONTENT_SEARCH_CRITERION: return get_content_location_for (relation_number, value_text); case NAUTILUS_FILE_TYPE_SEARCH_CRITERION: + g_assert (criterion->details->use_value_menu); return get_file_type_location_for (relation_number, value_number); case NAUTILUS_SIZE_SEARCH_CRITERION: @@ -464,8 +468,7 @@ nautilus_search_bar_criterion_get_location (NautilusSearchBarCriterion *criterio return get_owner_location_for (relation_number, value_text); default: - g_assert_not_reached (); - return NULL; + break; } g_assert_not_reached (); @@ -671,19 +674,14 @@ get_date_modified_location_for (int relation_number, /* Handle "is today" and "is yesterday" separately */ if (relation_number == 5) { result = g_strdup_printf ("%s is today", NAUTILUS_SEARCH_URI_TEXT_DATE_MODIFIED); - } - if (relation_number == 6) { + } else if (relation_number == 6) { result = g_strdup_printf ("%s is yesterday", NAUTILUS_SEARCH_URI_TEXT_DATE_MODIFIED); - } - if (relation_number != 5 && relation_number != 6) { - if (date_string == NULL) { - return g_strdup (""); - } - else { - result = g_strdup_printf ("%s %s %s", NAUTILUS_SEARCH_URI_TEXT_DATE_MODIFIED, - possible_relations[relation_number], - date_string); - } + } else if (date_string != NULL) { + result = g_strdup_printf ("%s %s %s", NAUTILUS_SEARCH_URI_TEXT_DATE_MODIFIED, + possible_relations[relation_number], + date_string); + } else { + result = g_strdup (""); } return result; |