On Sun, 2002-11-10 at 14:11, Dave Camp wrote: > nautilus-information-panel.[ch] still use EelBackgroundBox. i didn't see that. Here is another patch to clean some other stuff > > -dave > > On Sun, 2002-11-10 at 07:58, diego pemas net wrote: > > hi > > > > with the recent "deprecation" of nautilus-music-view the files > > eel-background-box.[c-h] are unneeded, should i clean them up? or is the music > > view going to be taken back to life? > > > > I have some patches laying around that clean up more stuff but i'm having > > problems with my ADSL connection, and i only have connection for a few minutes > > each day, once this is solved i will send the patches. > > > > Diego > > -- > > nautilus-list mailing list > > nautilus-list gnome org > > http://mail.gnome.org/mailman/listinfo/nautilus-list > > >
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/eel/ChangeLog,v
retrieving revision 1.474
diff -u -r1.474 ChangeLog
--- ChangeLog 5 Nov 2002 20:29:05 -0000 1.474
+++ ChangeLog 10 Nov 2002 16:11:50 -0000
@@ -1,3 +1,15 @@
+2002-11-10 Diego Gonzalez <diego pemas net>
+
+ * test/Makefile.am:
+ * test/test-eel-widgets.c: (main):
+ Took out the tests of removed code.
+
+ * eel/Makefile.am: remove eel-cell-renderer-pixbuf-list.[c-h],
+ eel-image-chooser.[c-h], eel-string-picker.[c-h] these file are
+ not use anymore.
+
+ * eel/eel.h: remove those files from here.
+
2002-11-05 Dave Camp <dave ximian com>
* test/Makefile.am:
Index: test/Makefile.am
===================================================================
RCS file: /cvs/gnome/eel/test/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- test/Makefile.am 5 Nov 2002 20:29:05 -0000 1.28
+++ test/Makefile.am 10 Nov 2002 16:11:50 -0000
@@ -21,7 +21,6 @@
test-eel-ellipsizing \
test-eel-editable-label \
test-eel-gtk-style \
- test-eel-image-chooser \
test-eel-image-scrolled \
test-eel-image-table \
test-eel-labeled-image \
@@ -34,7 +33,6 @@
test_eel_background_SOURCES = test-eel-background.c
test_eel_ellipsizing_SOURCES = test-eel-ellipsizing.c
test_eel_gtk_style_SOURCES = test-eel-gtk-style.c test.c
-test_eel_image_chooser_SOURCES = test-eel-image-chooser.c test.c test.h
test_eel_image_scrolled_SOURCES = test-eel-image-scrolled.c test.c test.h
test_eel_image_table_SOURCES = test-eel-image-table.c test.c
test_eel_labeled_image_SOURCES = test-eel-labeled-image.c test.c test.h
Index: test/test-eel-widgets.c
===================================================================
RCS file: /cvs/gnome/eel/test/test-eel-widgets.c,v
retrieving revision 1.13
diff -u -r1.13 test-eel-widgets.c
--- test/test-eel-widgets.c 5 Nov 2002 20:29:06 -0000 1.13
+++ test/test-eel-widgets.c 10 Nov 2002 16:11:50 -0000
@@ -1,41 +1,14 @@
#include <config.h>
#include <eel/eel-caption-table.h>
-#include <eel/eel-radio-button-group.h>
-#include <eel/eel-string-picker.h>
#include <eel/eel-stock-dialogs.h>
#include <gtk/gtk.h>
#include <libgnomeui/gnome-ui-init.h>
-static GdkPixbuf*
-create_pixbuf (const char *name)
-{
- char *path;
- GdkPixbuf *pixbuf;
-
- g_return_val_if_fail (name != NULL, NULL);
-
- path = g_strdup_printf ( DATADIR "/pixmaps/nautilus/%s", name);
-
- pixbuf = gdk_pixbuf_new_from_file (path, NULL);
- g_free (path);
-
- g_assert (pixbuf != NULL);
-
- return pixbuf;
-}
-
-static void test_radio_group (void);
-static void test_radio_group_horizontal (void);
static void test_caption_table (void);
-static void test_string_picker (void);
static void test_ok_dialog (void);
/* Callbacks */
-static void test_radio_changed_callback (GtkWidget *button_group,
- gpointer user_data);
-static void string_picker_changed_callback (GtkWidget *string_picker,
- gpointer user_data);
static void test_caption_table_activate_callback (GtkWidget *button_group,
gint active_index,
gpointer user_data);
@@ -47,10 +20,7 @@
libgnomeui_module_info_get (), argc, argv,
NULL);
- test_radio_group ();
- test_radio_group_horizontal ();
test_caption_table ();
- test_string_picker ();
test_ok_dialog ();
gtk_main ();
@@ -59,92 +29,6 @@
}
static void
-radio_group_load_it_up (EelRadioButtonGroup *group,
- gboolean use_icons,
- gboolean use_descriptions)
-{
- g_return_if_fail (group != NULL);
- g_return_if_fail (EEL_IS_RADIO_BUTTON_GROUP (group));
-
- eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (group), "Apples");
- eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (group), "Oranges");
- eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (group), "Strawberries");
-
- if (use_descriptions)
- {
- eel_radio_button_group_set_entry_description_text (EEL_RADIO_BUTTON_GROUP (group), 0, "Apple description");
- eel_radio_button_group_set_entry_description_text (EEL_RADIO_BUTTON_GROUP (group), 1, "Oranges description");
- eel_radio_button_group_set_entry_description_text (EEL_RADIO_BUTTON_GROUP (group), 2, "Strawberries description");
- }
-
- if (use_icons)
- {
- GdkPixbuf *pixbufs[3];
-
- pixbufs[0] = create_pixbuf ("novice.png");
- pixbufs[1] = create_pixbuf ("intermediate.png");
- pixbufs[2] = create_pixbuf ("expert.png");
-
- eel_radio_button_group_set_entry_pixbuf (EEL_RADIO_BUTTON_GROUP (group), 0, pixbufs[0]);
- eel_radio_button_group_set_entry_pixbuf (EEL_RADIO_BUTTON_GROUP (group), 1, pixbufs[1]);
- eel_radio_button_group_set_entry_pixbuf (EEL_RADIO_BUTTON_GROUP (group), 2, pixbufs[2]);
-
- g_object_unref (pixbufs[0]);
- g_object_unref (pixbufs[1]);
- g_object_unref (pixbufs[2]);
- }
-}
-
-static void
-test_radio_group (void)
-{
- GtkWidget *window;
- GtkWidget *buttons;
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (window), "radio group test");
-
- buttons = eel_radio_button_group_new (FALSE);
-
- radio_group_load_it_up (EEL_RADIO_BUTTON_GROUP (buttons), TRUE, TRUE);
-
- g_signal_connect (buttons,
- "changed",
- G_CALLBACK (test_radio_changed_callback),
- (gpointer) NULL);
-
- gtk_container_add (GTK_CONTAINER (window), buttons);
-
- gtk_widget_show (buttons);
-
- gtk_widget_show (window);
-}
-
-static void
-test_radio_group_horizontal (void)
-{
- GtkWidget *window;
- GtkWidget *buttons;
-
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (window), "horizontal radio group test");
-
- buttons = eel_radio_button_group_new (TRUE);
-
- radio_group_load_it_up (EEL_RADIO_BUTTON_GROUP (buttons), FALSE, FALSE);
-
- g_signal_connect (buttons,
- "changed",
- G_CALLBACK (test_radio_changed_callback),
- (gpointer) NULL);
-
- gtk_container_add (GTK_CONTAINER (window), buttons);
-
- gtk_widget_show (buttons);
-
- gtk_widget_show (window);
-}
-
-static void
test_caption_table (void)
{
GtkWidget * window;
@@ -193,69 +77,6 @@
gtk_widget_show (table);
gtk_widget_show (window);
-}
-
-static void
-test_string_picker (void)
-{
- GtkWidget *window;
- GtkWidget *picker;
- EelStringList *font_list;
-
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (window), "string picker test");
-
- picker = eel_string_picker_new ();
-
- eel_caption_set_title_label (EEL_CAPTION (picker), "Icon Font Family:");
-
- font_list = eel_string_list_new (TRUE);
-
- eel_string_list_insert (font_list, "Helvetica");
- eel_string_list_insert (font_list, "Times");
- eel_string_list_insert (font_list, "Courier");
- eel_string_list_insert (font_list, "Lucida");
- eel_string_list_insert (font_list, "Fixed");
-
- eel_string_picker_set_string_list (EEL_STRING_PICKER (picker), font_list);
-
- eel_string_list_free (font_list);
-
- gtk_container_add (GTK_CONTAINER (window), picker);
-
- g_signal_connect (picker,
- "changed",
- G_CALLBACK (string_picker_changed_callback),
- (gpointer) NULL);
-
- eel_string_picker_set_selected_string (EEL_STRING_PICKER (picker), "Fixed");
-
- gtk_widget_show_all (window);
-}
-
-static void
-string_picker_changed_callback (GtkWidget *string_picker, gpointer user_data)
-{
- char *text;
-
- g_assert (string_picker != NULL);
- g_assert (EEL_IS_STRING_PICKER (string_picker));
-
- text = eel_string_picker_get_selected_string (EEL_STRING_PICKER (string_picker));
-
- g_print ("string_picker_changed_callback(%s)\n", text);
-
- g_free (text);
-}
-
-static void
-test_radio_changed_callback (GtkWidget *buttons, gpointer user_data)
-{
- gint i;
-
- i = eel_radio_button_group_get_active_index (EEL_RADIO_BUTTON_GROUP (buttons));
-
- g_print ("test_radio_changed_callback (%d)\n", i);
}
static void
Index: eel/eel.h
===================================================================
RCS file: /cvs/gnome/eel/eel/eel.h,v
retrieving revision 1.17
diff -u -r1.17 eel.h
--- eel/eel.h 5 Nov 2002 09:05:33 -0000 1.17
+++ eel/eel.h 10 Nov 2002 16:11:50 -0000
@@ -44,17 +44,14 @@
#include <eel/eel-gtk-container.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
-#include <eel/eel-image-chooser.h>
#include <eel/eel-image-table.h>
#include <eel/eel-labeled-image.h>
#include <eel/eel-pango-extensions.h>
#include <eel/eel-password-dialog.h>
#include <eel/eel-preferences.h>
-#include <eel/eel-radio-button-group.h>
#include <eel/eel-self-checks.h>
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string-list.h>
-#include <eel/eel-string-picker.h>
#include <eel/eel-string.h>
#include <eel/eel-types.h>
#include <eel/eel-vfs-extensions.h>
Index: eel/Makefile.am
===================================================================
RCS file: /cvs/gnome/eel/eel/Makefile.am,v
retrieving revision 1.69
diff -u -r1.69 Makefile.am
--- eel/Makefile.am 5 Nov 2002 09:05:33 -0000 1.69
+++ eel/Makefile.am 10 Nov 2002 16:11:50 -0000
@@ -42,7 +42,6 @@
eel-canvas-rect-ellipse.c \
eel-caption-table.c \
eel-caption.c \
- eel-cell-renderer-pixbuf-list.c \
eel-dateedit-extensions.c \
eel-debug-drawing.c \
eel-debug.c \
@@ -60,7 +59,6 @@
eel-gtk-container.c \
eel-gtk-extensions.c \
eel-i18n.c \
- eel-image-chooser.c \
eel-image-table.c \
eel-labeled-image.c \
eel-lib-self-check-functions.c \
@@ -68,11 +66,9 @@
eel-password-dialog.c \
eel-preferences-glade.c \
eel-preferences.c \
- eel-radio-button-group.c \
eel-self-checks.c \
eel-stock-dialogs.c \
eel-string-list.c \
- eel-string-picker.c \
eel-string.c \
eel-types.c \
eel-vfs-extensions.c \
@@ -95,7 +91,6 @@
eel-canvas-rect-ellipse.h \
eel-caption-table.h \
eel-caption.h \
- eel-cell-renderer-pixbuf-list.h \
eel-dateedit-extensions.h \
eel-debug-drawing.h \
eel-debug.h \
@@ -114,18 +109,15 @@
eel-gtk-extensions.h \
eel-gtk-macros.h \
eel-i18n.h \
- eel-image-chooser.h \
eel-image-table.h \
eel-labeled-image.h \
eel-pango-extensions.h \
eel-password-dialog.h \
eel-preferences-glade.h \
eel-preferences.h \
- eel-radio-button-group.h \
eel-self-checks.h \
eel-stock-dialogs.h \
eel-string-list.h \
- eel-string-picker.h \
eel-string.h \
eel-types.h \
eel-vfs-extensions.h \
Index: ChangeLog =================================================================== RCS file: /cvs/gnome/nautilus/ChangeLog,v retrieving revision 1.5592 diff -u -r1.5592 ChangeLog --- ChangeLog 10 Nov 2002 09:13:31 -0000 1.5592 +++ ChangeLog 10 Nov 2002 16:50:49 -0000 @@ -1,3 +1,12 @@ +2002-11-10 Diego Gonzalez <diego pemas net> + + * src/file-manager/fm-list-view.c: remove include from + eel-cell-renderer-pixbuf-list.h, which wasn't used + + * test/Makefile.am: remove test-nautilus-preferences-change, + which uses deprecated stuff + * test/tes.h: remove eel-string-picker.h include + 2002-11-10 James Willcox <jwillcox gnome org> * docs/nautilus-context-menus.txt: Index: src/file-manager/fm-list-view.c =================================================================== RCS file: /cvs/gnome/nautilus/src/file-manager/fm-list-view.c,v retrieving revision 1.182 diff -u -r1.182 fm-list-view.c --- src/file-manager/fm-list-view.c 6 Nov 2002 10:39:11 -0000 1.182 +++ src/file-manager/fm-list-view.c 10 Nov 2002 16:50:49 -0000 @@ -30,7 +30,6 @@ #include "fm-error-reporting.h" #include "fm-list-model.h" -#include <eel/eel-cell-renderer-pixbuf-list.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtkcellrendererpixbuf.h> #include <gtk/gtkcellrenderertext.h> Index: test/Makefile.am =================================================================== RCS file: /cvs/gnome/nautilus/test/Makefile.am,v retrieving revision 1.47 diff -u -r1.47 Makefile.am --- test/Makefile.am 6 Nov 2002 01:32:10 -0000 1.47 +++ test/Makefile.am 10 Nov 2002 16:50:49 -0000 @@ -17,13 +17,11 @@ noinst_PROGRAMS =\ test-nautilus-mime-actions \ test-nautilus-mime-actions-set \ - test-nautilus-preferences-change \ 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_wrap_table_SOURCES = test-nautilus-wrap-table.c test.c EXTRA_DIST = \ Index: test/test.h =================================================================== RCS file: /cvs/gnome/nautilus/test/test.h,v retrieving revision 1.12 diff -u -r1.12 test.h --- test/test.h 6 Nov 2002 01:32:10 -0000 1.12 +++ test/test.h 10 Nov 2002 16:50:49 -0000 @@ -20,8 +20,6 @@ #include <eel/eel-string.h> #include <libnautilus-private/nautilus-file-utilities.h> -#include <eel/eel-string-picker.h> - void test_init (int *argc, char ***argv); int test_quit (int exit_code);
Attachment:
signature.asc
Description: This is a digitally signed message part