gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-07-16 10:17:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove use of EelGenerousBin, we can use a GtkBox with only one child for

Browse source 
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.
This commit is contained in:
Anders Carlsson 2004-01-03 18:34:46 +00:00 committed by Anders Carlsson
parent 8428367063
commit 9ade106bfd
10 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -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:

13
components/adapter/nautilus-adapter.c
View file

@ -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. */

2
src/nautilus-navigation-bar.c
View file

@ -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)

6
src/nautilus-navigation-bar.h
View file

@ -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,

1
src/nautilus-navigation-window.c
View file

@ -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>

3
src/nautilus-spatial-window.c
View file

@ -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);

2
src/nautilus-view-frame.c
View file

@ -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,

6
src/nautilus-view-frame.h
View file

@ -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. */

1
src/nautilus-window.c
View file

@ -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>

2
test/Makefile.am
View file

@ -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 = \