diff --git a/ChangeLog b/ChangeLog index ab47b7500..95d6c73df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-11-05 Dave Camp + + * test/Makefile.am: + * test/test.c: + * test/test.h: Removed property widget tests. + 2002-11-05 James Willcox * libnautilus-private/Makefile.am: diff --git a/po/POTFILES.in b/po/POTFILES.in index 5084b451b..2ed209c01 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -51,6 +51,7 @@ icons/tahoe/tahoe.xml libbackground/preview-file-selection.c libnautilus-private/filesystem-attributes.xml libnautilus-private/eggtreemultidnd.c +libnautilus-private/egg-recent-vfs-utils.c libnautilus-private/egg-screen-help.c libnautilus-private/nautilus-authn-manager.c libnautilus-private/nautilus-customization-data.c @@ -81,7 +82,6 @@ libnautilus/nautilus-clipboard.c nautilus.desktop.in nautilus-file-management-properties.desktop.in src/Nautilus_shell.server.in -src/file-manager/egg-recent-vfs-utils.c src/file-manager/fm-desktop-icon-view.c src/file-manager/fm-directory-view.c src/file-manager/fm-error-reporting.c diff --git a/test/Makefile.am b/test/Makefile.am index 02b174600..cd7e973b0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -18,14 +18,12 @@ noinst_PROGRAMS =\ test-nautilus-mime-actions \ test-nautilus-mime-actions-set \ test-nautilus-preferences-change \ - test-nautilus-preferences-display \ test-nautilus-wrap-table \ $(NULL) test_nautilus_mime_actions_SOURCES = test-nautilus-mime-actions.c test.c test_nautilus_mime_actions_set_SOURCES = test-nautilus-mime-actions-set.c test.c test_nautilus_preferences_change_SOURCES = test-nautilus-preferences-change.c test.c -test_nautilus_preferences_display_SOURCES = test-nautilus-preferences-display.c test.c test_nautilus_wrap_table_SOURCES = test-nautilus-wrap-table.c test.c EXTRA_DIST = \ diff --git a/test/test.c b/test/test.c index fc708e9d1..ce43f9a99 100644 --- a/test/test.c +++ b/test/test.c @@ -139,94 +139,6 @@ test_label_new (const char *text, return label; } -/* Preferences hacks */ -void -test_text_caption_set_text_for_int_preferences (EelTextCaption *text_caption, - const char *name) -{ - int int_value; - char *text; - - g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption)); - g_return_if_fail (name != NULL); - - int_value = eel_preferences_get_integer (name); - - text = g_strdup_printf ("%d", int_value); - - eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text); - - g_free (text); -} - -void -test_text_caption_set_text_for_string_preferences (EelTextCaption *text_caption, - const char *name) -{ - char *text; - - g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption)); - g_return_if_fail (name != NULL); - - text = eel_preferences_get (name); - - eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text); - - g_free (text); -} - -void -test_text_caption_set_text_for_default_int_preferences (EelTextCaption *text_caption, - const char *name) -{ - int int_value; - char *text; - - g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption)); - g_return_if_fail (name != NULL); - - int_value = 0; - - text = g_strdup_printf ("%d", int_value); - - eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text); - - g_free (text); -} - -void -test_text_caption_set_text_for_default_string_preferences (EelTextCaption *text_caption, - const char *name) -{ - char *text; - - g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption)); - g_return_if_fail (name != NULL); - - text = g_strdup (""); - - eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text); - - g_free (text); -} - -int -test_text_caption_get_text_as_int (const EelTextCaption *text_caption) -{ - int result = 0; - char *text; - - g_return_val_if_fail (EEL_IS_TEXT_CAPTION (text_caption), 0); - - text = eel_text_caption_get_text (text_caption); - - eel_str_to_int (text, &result); - - g_free (text); - - return result; -} - void test_window_set_title_with_pid (GtkWindow *window, const char *title) diff --git a/test/test.h b/test/test.h index 12f88254f..42d09f321 100644 --- a/test/test.h +++ b/test/test.h @@ -20,7 +20,6 @@ #include #include -#include #include void test_init (int *argc, @@ -49,16 +48,5 @@ void test_pixbuf_draw_rectangle_tiled (GdkPixbuf *pi int opacity); void test_window_set_title_with_pid (GtkWindow *window, const char *title); -int test_text_caption_get_text_as_int (const EelTextCaption *text_caption); - -/* Preferences hacks */ -void test_text_caption_set_text_for_int_preferences (EelTextCaption *text_caption, - const char *name); -void test_text_caption_set_text_for_string_preferences (EelTextCaption *text_caption, - const char *name); -void test_text_caption_set_text_for_default_int_preferences (EelTextCaption *text_caption, - const char *name); -void test_text_caption_set_text_for_default_string_preferences (EelTextCaption *text_caption, - const char *name); #endif /* TEST_H */