Commit 737b2381 authored by Darin Adler's avatar Darin Adler
Browse files

Fixed typos and oversights in Maciej's check-in.

He didn't compile his changes :-(
parent 2dcd5c3f
2000-01-11 Darin Adler <darin@eazel.com>
* libnautilus/ntl-view-frame.c: Fixed typos and oversights in
Maciej's check-in. He didn't compile his changes :-(
2000-01-11 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-frame.c, libnautilus/ntl-view-frame.h: Redo
......
......@@ -40,8 +40,7 @@ enum {
LAST_SIGNAL
};
static guint nautilus_view_frame_signals[LAST_SIGNAL];
static guint nautilus_view_frame_signals[LAST_SIGNAL];
typedef struct {
POA_Nautilus_View servant;
......@@ -111,7 +110,7 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
CORBA_char * config_path,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path);
}
static void
......@@ -119,14 +118,14 @@ impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
}
static void
impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]);
}
static void
......@@ -134,14 +133,14 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
Nautilus_SelectionInfo * selinfo,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
}
static void
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]);
}
......@@ -270,49 +269,49 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
klass->servant_destroy_func = POA_Nautilus_View__fini;
klass->vepv = &impl_Nautilus_View_vepv;
klass->view_frame_signals[NOTIFY_LOCATION_CHANGE] =
nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_frame_signals[NOTIFY_SELECTION_CHANGE] =
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_frame_signals[LOAD_STATE] =
nautilus_view_frame_signals[LOAD_STATE] =
gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_frame_signals[SAVE_STATE] =
nautilus_view_frame_signals[SAVE_STATE] =
gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_frame_signals[SHOW_PROPERTIES] =
nautilus_view_frame_signals[SHOW_PROPERTIES] =
gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_frame_signals[STOP_LOCATION_CHANGE] =
nautilus_view_frame_signals[STOP_LOCATION_CHANGE] =
gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, LAST_SIGNAL);
gtk_object_class_add_signals (object_class, nautilus_view_frame_signals, LAST_SIGNAL);
}
static void
......
......@@ -40,8 +40,7 @@ enum {
LAST_SIGNAL
};
static guint nautilus_view_frame_signals[LAST_SIGNAL];
static guint nautilus_view_frame_signals[LAST_SIGNAL];
typedef struct {
POA_Nautilus_View servant;
......@@ -111,7 +110,7 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
CORBA_char * config_path,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path);
}
static void
......@@ -119,14 +118,14 @@ impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
}
static void
impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]);
}
static void
......@@ -134,14 +133,14 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
Nautilus_SelectionInfo * selinfo,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
}
static void
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]);
}
......@@ -270,49 +269,49 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
klass->servant_destroy_func = POA_Nautilus_View__fini;
klass->vepv = &impl_Nautilus_View_vepv;
klass->view_frame_signals[NOTIFY_LOCATION_CHANGE] =
nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_frame_signals[NOTIFY_SELECTION_CHANGE] =
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_frame_signals[LOAD_STATE] =
nautilus_view_frame_signals[LOAD_STATE] =
gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_frame_signals[SAVE_STATE] =
nautilus_view_frame_signals[SAVE_STATE] =
gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_frame_signals[SHOW_PROPERTIES] =
nautilus_view_frame_signals[SHOW_PROPERTIES] =
gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_frame_signals[STOP_LOCATION_CHANGE] =
nautilus_view_frame_signals[STOP_LOCATION_CHANGE] =
gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, LAST_SIGNAL);
gtk_object_class_add_signals (object_class, nautilus_view_frame_signals, LAST_SIGNAL);
}
static void
......
......@@ -40,8 +40,7 @@ enum {
LAST_SIGNAL
};
static guint nautilus_view_frame_signals[LAST_SIGNAL];
static guint nautilus_view_frame_signals[LAST_SIGNAL];
typedef struct {
POA_Nautilus_View servant;
......@@ -111,7 +110,7 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
CORBA_char * config_path,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path);
}
static void
......@@ -119,14 +118,14 @@ impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
}
static void
impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]);
}
static void
......@@ -134,14 +133,14 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
Nautilus_SelectionInfo * selinfo,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
}
static void
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
{
gtk_signal_emit_by_name(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]);
}
......@@ -270,49 +269,49 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
klass->servant_destroy_func = POA_Nautilus_View__fini;
klass->vepv = &impl_Nautilus_View_vepv;
klass->view_frame_signals[NOTIFY_LOCATION_CHANGE] =
nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_frame_signals[NOTIFY_SELECTION_CHANGE] =
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_frame_signals[LOAD_STATE] =
nautilus_view_frame_signals[LOAD_STATE] =
gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_frame_signals[SAVE_STATE] =
nautilus_view_frame_signals[SAVE_STATE] =
gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_frame_signals[SHOW_PROPERTIES] =
nautilus_view_frame_signals[SHOW_PROPERTIES] =
gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_frame_signals[STOP_LOCATION_CHANGE] =
nautilus_view_frame_signals[STOP_LOCATION_CHANGE] =
gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, LAST_SIGNAL);
gtk_object_class_add_signals (object_class, nautilus_view_frame_signals, LAST_SIGNAL);
}
static void
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment