mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-24 18:25:50 +00:00
Did some fixes based on a patch Michael sent me.
* cut-n-paste-code/widgets/e-paned/e-paned.c: (e_paned_class_init): Turn off e_paned_expose for now. * libnautilus-private/nautilus-icon-container.c: (nautilus_icon_container_class_init): Marshaller said the parameters were strings, but they were actually pointers to strings. * libnautilus/nautilus-view.c: (queue_incoming_call): Pass servant, not bonobo object. * src/nautilus-view-frame.c: (nautilus_view_frame_init), (attach_view): Switch to eel versions of connect_while_alive functions, since the gtk versions work only on gtk objects.
This commit is contained in:
parent
f7e2844c0c
commit
5fb5bf3739
19
ChangeLog
19
ChangeLog
|
@ -1,3 +1,22 @@
|
|||
2001-11-06 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
Did some fixes based on a patch Michael sent me.
|
||||
|
||||
* cut-n-paste-code/widgets/e-paned/e-paned.c:
|
||||
(e_paned_class_init): Turn off e_paned_expose for now.
|
||||
|
||||
* libnautilus-private/nautilus-icon-container.c:
|
||||
(nautilus_icon_container_class_init): Marshaller said the
|
||||
parameters were strings, but they were actually pointers to
|
||||
strings.
|
||||
|
||||
* libnautilus/nautilus-view.c: (queue_incoming_call): Pass
|
||||
servant, not bonobo object.
|
||||
|
||||
* src/nautilus-view-frame.c: (nautilus_view_frame_init),
|
||||
(attach_view): Switch to eel versions of connect_while_alive
|
||||
functions, since the gtk versions work only on gtk objects.
|
||||
|
||||
2001-11-06 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* Lots of files.
|
||||
|
|
|
@ -42,27 +42,6 @@ enum {
|
|||
|
||||
static void e_paned_class_init (EPanedClass *klass);
|
||||
static void e_paned_init (EPaned *paned);
|
||||
static void e_paned_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void e_paned_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void e_paned_realize (GtkWidget *widget);
|
||||
static void e_paned_map (GtkWidget *widget);
|
||||
static void e_paned_unmap (GtkWidget *widget);
|
||||
static void e_paned_unrealize (GtkWidget *widget);
|
||||
static gint e_paned_expose (GtkWidget *widget,
|
||||
GdkEventExpose *event);
|
||||
static void e_paned_add (GtkContainer *container,
|
||||
GtkWidget *widget);
|
||||
static void e_paned_remove (GtkContainer *container,
|
||||
GtkWidget *widget);
|
||||
static void e_paned_forall (GtkContainer *container,
|
||||
gboolean include_internals,
|
||||
GtkCallback callback,
|
||||
gpointer callback_data);
|
||||
static GtkType e_paned_child_type (GtkContainer *container);
|
||||
|
||||
static GtkContainerClass *parent_class = NULL;
|
||||
|
||||
|
@ -92,41 +71,6 @@ e_paned_get_type (void)
|
|||
return paned_type;
|
||||
}
|
||||
|
||||
static void
|
||||
e_paned_class_init (EPanedClass *klass)
|
||||
{
|
||||
GtkObjectClass *object_class;
|
||||
GtkWidgetClass *widget_class;
|
||||
GtkContainerClass *container_class;
|
||||
|
||||
object_class = (GtkObjectClass *) klass;
|
||||
widget_class = (GtkWidgetClass *) klass;
|
||||
container_class = (GtkContainerClass *) klass;
|
||||
|
||||
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
|
||||
|
||||
object_class->set_arg = e_paned_set_arg;
|
||||
object_class->get_arg = e_paned_get_arg;
|
||||
|
||||
widget_class->realize = e_paned_realize;
|
||||
widget_class->map = e_paned_map;
|
||||
widget_class->unmap = e_paned_unmap;
|
||||
widget_class->unrealize = e_paned_unrealize;
|
||||
widget_class->expose_event = e_paned_expose;
|
||||
|
||||
container_class->add = e_paned_add;
|
||||
container_class->remove = e_paned_remove;
|
||||
container_class->forall = e_paned_forall;
|
||||
container_class->child_type = e_paned_child_type;
|
||||
|
||||
klass->handle_shown = NULL;
|
||||
|
||||
gtk_object_add_arg_type("EPaned::handle_size", GTK_TYPE_UINT,
|
||||
GTK_ARG_READWRITE, ARG_HANDLE_SIZE);
|
||||
gtk_object_add_arg_type("EPaned::quantum", GTK_TYPE_UINT,
|
||||
GTK_ARG_READWRITE, ARG_QUANTUM);
|
||||
}
|
||||
|
||||
static GtkType
|
||||
e_paned_child_type (GtkContainer *container)
|
||||
{
|
||||
|
@ -320,6 +264,8 @@ e_paned_unrealize (GtkWidget *widget)
|
|||
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
|
||||
}
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
|
||||
static gint
|
||||
e_paned_expose (GtkWidget *widget,
|
||||
GdkEventExpose *event)
|
||||
|
@ -362,6 +308,8 @@ e_paned_expose (GtkWidget *widget,
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void
|
||||
e_paned_add1 (EPaned *paned,
|
||||
GtkWidget *widget)
|
||||
|
@ -636,3 +584,40 @@ e_paned_quantized_size(EPaned *paned,
|
|||
quantization *= paned->quantum;
|
||||
return paned->old_child1_size + quantization;
|
||||
}
|
||||
|
||||
static void
|
||||
e_paned_class_init (EPanedClass *klass)
|
||||
{
|
||||
GtkObjectClass *object_class;
|
||||
GtkWidgetClass *widget_class;
|
||||
GtkContainerClass *container_class;
|
||||
|
||||
object_class = (GtkObjectClass *) klass;
|
||||
widget_class = (GtkWidgetClass *) klass;
|
||||
container_class = (GtkContainerClass *) klass;
|
||||
|
||||
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
|
||||
|
||||
object_class->set_arg = e_paned_set_arg;
|
||||
object_class->get_arg = e_paned_get_arg;
|
||||
|
||||
widget_class->realize = e_paned_realize;
|
||||
widget_class->map = e_paned_map;
|
||||
widget_class->unmap = e_paned_unmap;
|
||||
widget_class->unrealize = e_paned_unrealize;
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
widget_class->expose_event = e_paned_expose;
|
||||
#endif
|
||||
|
||||
container_class->add = e_paned_add;
|
||||
container_class->remove = e_paned_remove;
|
||||
container_class->forall = e_paned_forall;
|
||||
container_class->child_type = e_paned_child_type;
|
||||
|
||||
klass->handle_shown = NULL;
|
||||
|
||||
gtk_object_add_arg_type("EPaned::handle_size", GTK_TYPE_UINT,
|
||||
GTK_ARG_READWRITE, ARG_HANDLE_SIZE);
|
||||
gtk_object_add_arg_type("EPaned::quantum", GTK_TYPE_UINT,
|
||||
GTK_ARG_READWRITE, ARG_QUANTUM);
|
||||
}
|
||||
|
|
|
@ -3179,11 +3179,11 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
|
|||
G_STRUCT_OFFSET (NautilusIconContainerClass,
|
||||
get_icon_text),
|
||||
NULL, NULL,
|
||||
eel_marshal_VOID__POINTER_STRING_STRING,
|
||||
gtk_marshal_VOID__POINTER_POINTER_POINTER,
|
||||
G_TYPE_NONE, 3,
|
||||
GTK_TYPE_POINTER,
|
||||
G_TYPE_STRING,
|
||||
G_TYPE_STRING);
|
||||
G_TYPE_POINTER,
|
||||
G_TYPE_POINTER,
|
||||
G_TYPE_POINTER);
|
||||
signals[GET_ICON_URI]
|
||||
= g_signal_new ("get_icon_uri",
|
||||
G_TYPE_FROM_CLASS (object_class),
|
||||
|
|
|
@ -85,7 +85,7 @@ queue_incoming_call (PortableServer_Servant servant,
|
|||
{
|
||||
NautilusView *view;
|
||||
|
||||
view = NAUTILUS_VIEW (bonobo_object_from_servant (bonobo_object));
|
||||
view = NAUTILUS_VIEW (bonobo_object_from_servant (servant));
|
||||
|
||||
nautilus_idle_queue_add (view->details->incoming_queue,
|
||||
(GFunc) call,
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
#include <bonobo/bonobo-control-frame.h>
|
||||
#include <bonobo/bonobo-zoomable-frame.h>
|
||||
#include <bonobo/bonobo-zoomable.h>
|
||||
#include <eel/eel-gobject-extensions.h>
|
||||
#include <eel/eel-gtk-extensions.h>
|
||||
#include <eel/eel-gtk-macros.h>
|
||||
#include <eel/eel-marshal.h>
|
||||
|
@ -320,14 +321,14 @@ nautilus_view_frame_init (NautilusViewFrame *view)
|
|||
|
||||
view->details->idle_queue = nautilus_idle_queue_new ();
|
||||
|
||||
gtk_signal_connect_object_while_alive (nautilus_signaller_get_current (),
|
||||
eel_signal_connect_object_while_alive (G_OBJECT (nautilus_signaller_get_current ()),
|
||||
"history_list_changed",
|
||||
G_CALLBACK (send_history),
|
||||
GTK_OBJECT (view));
|
||||
gtk_signal_connect_object_while_alive (GTK_OBJECT (nautilus_icon_factory_get ()),
|
||||
G_OBJECT (view));
|
||||
eel_signal_connect_object_while_alive (G_OBJECT (nautilus_icon_factory_get ()),
|
||||
"icons_changed",
|
||||
G_CALLBACK (send_history),
|
||||
GTK_OBJECT (view));
|
||||
G_OBJECT (view));
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -798,42 +799,42 @@ attach_view (NautilusViewFrame *view,
|
|||
|
||||
widget = bonobo_control_frame_get_widget (view->details->control_frame);
|
||||
|
||||
gtk_signal_connect_object_while_alive
|
||||
(GTK_OBJECT (view->details->view_frame),
|
||||
eel_signal_connect_object_while_alive
|
||||
(G_OBJECT (view->details->view_frame),
|
||||
"destroy",
|
||||
G_CALLBACK (view_frame_failed), GTK_OBJECT (view));
|
||||
gtk_signal_connect_object_while_alive
|
||||
(GTK_OBJECT (view->details->view_frame),
|
||||
G_CALLBACK (view_frame_failed), G_OBJECT (view));
|
||||
eel_signal_connect_object_while_alive
|
||||
(G_OBJECT (view->details->view_frame),
|
||||
"system_exception",
|
||||
G_CALLBACK (queue_view_frame_failed), GTK_OBJECT (view));
|
||||
G_CALLBACK (queue_view_frame_failed), G_OBJECT (view));
|
||||
|
||||
gtk_signal_connect_object_while_alive
|
||||
(GTK_OBJECT (view->details->control_frame),
|
||||
eel_signal_connect_object_while_alive
|
||||
(G_OBJECT (view->details->control_frame),
|
||||
"system_exception",
|
||||
G_CALLBACK (queue_view_frame_failed), GTK_OBJECT (view));
|
||||
G_CALLBACK (queue_view_frame_failed), G_OBJECT (view));
|
||||
|
||||
gtk_signal_connect_while_alive
|
||||
(GTK_OBJECT (widget),
|
||||
eel_signal_connect_while_alive
|
||||
(G_OBJECT (widget),
|
||||
"remove",
|
||||
G_CALLBACK (check_socket_gone_callback), view,
|
||||
GTK_OBJECT (view));
|
||||
G_OBJECT (view));
|
||||
|
||||
if (view->details->zoomable_frame != NULL) {
|
||||
gtk_signal_connect_object_while_alive
|
||||
(GTK_OBJECT (view->details->zoomable_frame),
|
||||
eel_signal_connect_object_while_alive
|
||||
(G_OBJECT (view->details->zoomable_frame),
|
||||
"system_exception",
|
||||
G_CALLBACK (queue_view_frame_failed), GTK_OBJECT (view));
|
||||
G_CALLBACK (queue_view_frame_failed), G_OBJECT (view));
|
||||
|
||||
gtk_signal_connect_while_alive
|
||||
(GTK_OBJECT (view->details->zoomable_frame),
|
||||
eel_signal_connect_while_alive
|
||||
(G_OBJECT (view->details->zoomable_frame),
|
||||
"zoom_parameters_changed",
|
||||
G_CALLBACK (zoom_parameters_changed_callback), view,
|
||||
GTK_OBJECT (view));
|
||||
gtk_signal_connect_while_alive
|
||||
(GTK_OBJECT (view->details->zoomable_frame),
|
||||
G_OBJECT (view));
|
||||
eel_signal_connect_while_alive
|
||||
(G_OBJECT (view->details->zoomable_frame),
|
||||
"zoom_level_changed",
|
||||
G_CALLBACK (zoom_level_changed_callback), view,
|
||||
GTK_OBJECT (view));
|
||||
G_OBJECT (view));
|
||||
}
|
||||
|
||||
gtk_widget_show (widget);
|
||||
|
|
Loading…
Reference in a new issue