summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog17
-rw-r--r--components/adapter/nautilus-adapter.c13
-rw-r--r--src/nautilus-navigation-bar.c2
-rw-r--r--src/nautilus-navigation-bar.h6
-rw-r--r--src/nautilus-navigation-window.c1
-rw-r--r--src/nautilus-spatial-window.c3
-rw-r--r--src/nautilus-view-frame.c2
-rw-r--r--src/nautilus-view-frame.h6
-rw-r--r--src/nautilus-window.c1
-rw-r--r--test/Makefile.am2
10 files changed, 32 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index a629be008..fbd7ce9ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2004-01-03 Anders Carlsson <andersca@gnome.org>
+
+ * components/adapter/nautilus-adapter.c: (nautilus_adapter_new):
+ * src/nautilus-navigation-bar.c:
+ * src/nautilus-navigation-bar.h:
+ * src/nautilus-navigation-window.c:
+ * src/nautilus-spatial-window.c:
+ (nautilus_spatial_window_instance_init):
+ * src/nautilus-view-frame.c:
+ * src/nautilus-view-frame.h:
+ * src/nautilus-window.c:
+ Remove use of EelGenerousBin, we can use a GtkBox with only one
+ child for that instead.
+
+ * test/Makefile.am:
+ Don't use Eel stuff that no-one else uses.
+
2004-01-02 Dennis Cranston <dennis_cranston at yahoo com>
* src/nautilus-connect-server-dialog.c:
diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c
index 67502ee05..ba17057f2 100644
--- a/components/adapter/nautilus-adapter.c
+++ b/components/adapter/nautilus-adapter.c
@@ -33,10 +33,9 @@
#include "nautilus-adapter-load-strategy.h"
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-item-container.h>
-#include <eel/eel-generous-bin.h>
#include <eel/eel-gtk-macros.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtkhbox.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock-icons.h>
#include <libnautilus-adapter/nautilus-adapter-factory.h>
@@ -123,7 +122,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
{
NautilusAdapter *adapter;
BonoboControl *control;
- GtkWidget *bin;
+ GtkWidget *box;
BonoboObject *zoomable;
/* FIXME bugzilla.gnome.org 44405: should be done with
@@ -133,9 +132,9 @@ nautilus_adapter_new (Bonobo_Unknown component)
adapter = NAUTILUS_ADAPTER (g_object_new (NAUTILUS_TYPE_ADAPTER, NULL));
/* Set up a few wrapper framework details */
- bin = gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL);
- gtk_widget_show (bin);
- control = bonobo_control_new (bin);
+ box = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (box);
+ control = bonobo_control_new (box);
adapter->details->nautilus_view = nautilus_view_new_from_bonobo_control (control);
g_object_weak_ref (G_OBJECT (adapter->details->nautilus_view),
@@ -180,7 +179,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
adapter, G_CONNECT_SWAPPED);
/* complete the embedding */
- gtk_container_add (GTK_CONTAINER (bin),
+ gtk_container_add (GTK_CONTAINER (box),
nautilus_adapter_embed_strategy_get_widget (adapter->details->embed_strategy));
/* hook up view signals. */
diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c
index 8307da47e..65709d395 100644
--- a/src/nautilus-navigation-bar.c
+++ b/src/nautilus-navigation-bar.c
@@ -43,7 +43,7 @@ static guint signals[LAST_SIGNAL];
static void nautilus_navigation_bar_class_init (NautilusNavigationBarClass *class);
static void nautilus_navigation_bar_init (NautilusNavigationBar *bar);
-EEL_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, EEL_TYPE_GENEROUS_BIN)
+EEL_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, GTK_TYPE_HBOX)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, get_location)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, set_location)
diff --git a/src/nautilus-navigation-bar.h b/src/nautilus-navigation-bar.h
index 97e3ccdfa..a5bcd8fc5 100644
--- a/src/nautilus-navigation-bar.h
+++ b/src/nautilus-navigation-bar.h
@@ -29,7 +29,7 @@
#ifndef NAUTILUS_NAVIGATION_BAR_H
#define NAUTILUS_NAVIGATION_BAR_H
-#include <eel/eel-generous-bin.h>
+#include <gtk/gtkhbox.h>
#define NAUTILUS_TYPE_NAVIGATION_BAR (nautilus_navigation_bar_get_type ())
#define NAUTILUS_NAVIGATION_BAR(obj) \
@@ -40,11 +40,11 @@
GTK_CHECK_TYPE (obj, NAUTILUS_TYPE_NAVIGATION_BAR)
typedef struct {
- EelGenerousBin parent;
+ GtkHBox parent;
} NautilusNavigationBar;
typedef struct {
- EelGenerousBinClass parent_class;
+ GtkHBoxClass parent_class;
/* signals */
void (* location_changed) (NautilusNavigationBar *bar,
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 7df7380fe..c7c55a0f9 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -46,7 +46,6 @@
#include <eel/eel-debug.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-generous-bin.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-stock-dialogs.h>
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 8a19e7f97..a3d84d94d 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -46,7 +46,6 @@
#include <eel/eel-debug.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-generous-bin.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-string.h>
@@ -339,7 +338,7 @@ nautilus_spatial_window_instance_init (NautilusSpatialWindow *window)
window->affect_spatial_window_on_next_location_change = TRUE;
window->details->content_box =
- gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL);
+ gtk_hbox_new (FALSE, 0);
gtk_widget_show (window->details->content_box);
bonobo_window_set_contents (BONOBO_WINDOW (window),
window->details->content_box);
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index a7bb916f6..336350b40 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -130,7 +130,7 @@ static guint signals[LAST_SIGNAL];
EEL_CLASS_BOILERPLATE (NautilusViewFrame,
nautilus_view_frame,
- EEL_TYPE_GENEROUS_BIN)
+ GTK_TYPE_HBOX)
void
nautilus_view_frame_queue_incoming_call (PortableServer_Servant servant,
diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h
index 12906dd31..39b6340aa 100644
--- a/src/nautilus-view-frame.h
+++ b/src/nautilus-view-frame.h
@@ -35,7 +35,7 @@
#include <bonobo/bonobo-ui-container.h>
#include <bonobo/bonobo-zoomable-frame.h>
-#include <eel/eel-generous-bin.h>
+#include <gtk/gtkhbox.h>
#include <libnautilus-private/nautilus-undo-manager.h>
#include <libnautilus/nautilus-view-component.h>
@@ -48,12 +48,12 @@
typedef struct NautilusViewFrameDetails NautilusViewFrameDetails;
typedef struct {
- EelGenerousBin parent;
+ GtkHBox parent;
NautilusViewFrameDetails *details;
} NautilusViewFrame;
typedef struct {
- EelGenerousBinClass parent_spot;
+ GtkHBoxClass parent_spot;
/* These roughly correspond to CORBA calls, but in some cases they are higher level. */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 23bb15643..61f482e8c 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -44,7 +44,6 @@
#include <eel/eel-debug.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-generous-bin.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-stock-dialogs.h>
diff --git a/test/Makefile.am b/test/Makefile.am
index cd7e973b0..739b213c5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -17,13 +17,11 @@ LDADD =\
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 = \
View Lorry Controller Status