[monkey-bubble: 447/753] Moved to libgnome-extra/libgnomeui. Likewise. Likewise.
- From: Sven Herzberg <herzi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [monkey-bubble: 447/753] Moved to libgnome-extra/libgnomeui. Likewise. Likewise.
- Date: Wed, 14 Jul 2010 22:33:14 +0000 (UTC)
commit cfc3acf8155152c7fcbd6cb59cd2f410a2de7dd1
Author: Martin Baulig <baulig suse de>
Date: Wed Jun 13 18:21:37 2001 +0000
Moved to libgnome-extra/libgnomeui. Likewise. Likewise.
2001-06-13 Martin Baulig <baulig suse de>
* gnome-selector-client.[ch]: Moved to libgnome-extra/libgnomeui.
* gnome-selector-dialog-client.[ch]: Likewise.
* gnome-selector-component.[ch]: Likewise.
* gnome-selector-widget.[ch]: Renamed to gnome-component-widget.[ch].
libgnomeui/ChangeLog | 8 ++++
libgnomeui/Makefile.am | 10 +----
libgnomeui/gnome-component-widget.c | 80 +++++++++++++++++-----------------
libgnomeui/gnome-component-widget.h | 30 +++++++-------
libgnomeui/gnome-entry.c | 11 ++---
libgnomeui/gnome-entry.h | 7 +--
libgnomeui/gnome-image-entry.c | 8 ++--
libgnomeui/gnome-image-entry.h | 7 +--
libgnomeui/gnome-image-selector.c | 10 ++--
libgnomeui/gnome-image-selector.h | 7 +--
10 files changed, 88 insertions(+), 90 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index 7f26888..a874b80 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-13 Martin Baulig <baulig suse de>
+
+ * gnome-selector-client.[ch]: Moved to libgnome-extra/libgnomeui.
+ * gnome-selector-dialog-client.[ch]: Likewise.
+ * gnome-selector-component.[ch]: Likewise.
+
+ * gnome-selector-widget.[ch]: Renamed to gnome-component-widget.[ch].
+
2001-06-12 Martin Baulig <baulig suse de>
* libgnomeui-2.0.pc.in: Depend on libgnomecanvas-2.0, but not on gconf-2.0.
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index e66ac4c..9bd282f 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -80,10 +80,7 @@ libgnomeui_2_la_SOURCES = \
gnome-druid-page-edge.c \
gnome-druid-page-standard.c \
gnome-geometry.c \
- gnome-selector-client.c \
- gnome-selector-component.c \
- gnome-selector-dialog-client.c \
- gnome-selector-widget.c \
+ gnome-component-widget.c \
gnome-entry.c \
gnome-image-entry.c \
gnome-image-selector.c \
@@ -119,10 +116,7 @@ gnome_headers = \
gnome-druid-page.h \
gnome-druid-page-edge.h \
gnome-druid-page-standard.h \
- gnome-selector-client.h \
- gnome-selector-component.h \
- gnome-selector-dialog-client.h \
- gnome-selector-widget.h \
+ gnome-component-widget.h \
gnome-entry.h \
gnome-image-entry.h \
gnome-image-selector.h \
diff --git a/libgnomeui/gnome-component-widget.c b/libgnomeui/gnome-component-widget.c
index 46d03dc..f198fa3 100644
--- a/libgnomeui/gnome-component-widget.c
+++ b/libgnomeui/gnome-component-widget.c
@@ -25,13 +25,13 @@
*/
#include <config.h>
-#include <libgnomeui/gnome-selector-widget.h>
+#include <libgnomeui/gnome-component-widget.h>
#include <bonobo/bonobo-moniker-util.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-async.h>
#include <bonobo/bonobo-main.h>
-struct _GnomeSelectorWidgetPrivate {
+struct _GnomeComponentWidgetPrivate {
gchar *moniker;
Bonobo_Unknown corba_objref;
Bonobo_UIContainer corba_ui_container;
@@ -40,11 +40,11 @@ struct _GnomeSelectorWidgetPrivate {
};
static GObject*
-gnome_selector_widget_constructor (GType type,
+gnome_component_widget_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
-static BonoboWidgetClass *gnome_selector_widget_parent_class;
+static BonoboWidgetClass *gnome_component_widget_parent_class;
enum {
PROP_0,
@@ -56,26 +56,26 @@ enum {
};
static void
-gnome_selector_widget_finalize (GObject *object)
+gnome_component_widget_finalize (GObject *object)
{
- GnomeSelectorWidget *widget = GNOME_SELECTOR_WIDGET (object);
+ GnomeComponentWidget *widget = GNOME_COMPONENT_WIDGET (object);
g_free (widget->_priv);
widget->_priv = NULL;
- G_OBJECT_CLASS (gnome_selector_widget_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gnome_component_widget_parent_class)->finalize (object);
}
static void
-gnome_selector_widget_set_property (GObject *object, guint param_id,
+gnome_component_widget_set_property (GObject *object, guint param_id,
const GValue *value, GParamSpec *pspec)
{
- GnomeSelectorWidget *widget;
+ GnomeComponentWidget *widget;
g_return_if_fail (object != NULL);
- g_return_if_fail (GNOME_IS_SELECTOR_WIDGET (object));
+ g_return_if_fail (GNOME_IS_COMPONENT_WIDGET (object));
- widget = GNOME_SELECTOR_WIDGET (object);
+ widget = GNOME_COMPONENT_WIDGET (object);
switch (param_id) {
case PROP_MONIKER:
@@ -97,15 +97,15 @@ gnome_selector_widget_set_property (GObject *object, guint param_id,
}
static void
-gnome_selector_widget_get_property (GObject *object, guint param_id, GValue *value,
+gnome_component_widget_get_property (GObject *object, guint param_id, GValue *value,
GParamSpec *pspec)
{
- GnomeSelectorWidget *widget;
+ GnomeComponentWidget *widget;
g_return_if_fail (object != NULL);
- g_return_if_fail (GNOME_IS_SELECTOR_WIDGET (object));
+ g_return_if_fail (GNOME_IS_COMPONENT_WIDGET (object));
- widget = GNOME_SELECTOR_WIDGET (object);
+ widget = GNOME_COMPONENT_WIDGET (object);
switch (param_id) {
case PROP_MONIKER:
@@ -124,16 +124,16 @@ gnome_selector_widget_get_property (GObject *object, guint param_id, GValue *val
}
static void
-gnome_selector_widget_class_init (GnomeSelectorWidgetClass *klass)
+gnome_component_widget_class_init (GnomeComponentWidgetClass *klass)
{
GObjectClass *object_class = (GObjectClass *) klass;
- gnome_selector_widget_parent_class = g_type_class_peek_parent (klass);
+ gnome_component_widget_parent_class = g_type_class_peek_parent (klass);
- object_class->constructor = gnome_selector_widget_constructor;
- object_class->finalize = gnome_selector_widget_finalize;
- object_class->set_property = gnome_selector_widget_set_property;
- object_class->get_property = gnome_selector_widget_get_property;
+ object_class->constructor = gnome_component_widget_constructor;
+ object_class->finalize = gnome_component_widget_finalize;
+ object_class->set_property = gnome_component_widget_set_property;
+ object_class->get_property = gnome_component_widget_get_property;
/* Construction properties */
g_object_class_install_property
@@ -158,23 +158,23 @@ gnome_selector_widget_class_init (GnomeSelectorWidgetClass *klass)
}
static void
-gnome_selector_widget_init (GnomeSelectorWidget *widget)
+gnome_component_widget_init (GnomeComponentWidget *widget)
{
- widget->_priv = g_new0 (GnomeSelectorWidgetPrivate, 1);
+ widget->_priv = g_new0 (GnomeComponentWidgetPrivate, 1);
}
GtkType
-gnome_selector_widget_get_type (void)
+gnome_component_widget_get_type (void)
{
static GtkType type = 0;
if (! type) {
static const GtkTypeInfo info = {
- "GnomeSelectorWidget",
- sizeof (GnomeSelectorWidget),
- sizeof (GnomeSelectorWidgetClass),
- (GtkClassInitFunc) gnome_selector_widget_class_init,
- (GtkObjectInitFunc) gnome_selector_widget_init,
+ "GnomeComponentWidget",
+ sizeof (GnomeComponentWidget),
+ sizeof (GnomeComponentWidgetClass),
+ (GtkClassInitFunc) gnome_component_widget_class_init,
+ (GtkObjectInitFunc) gnome_component_widget_init,
NULL, /* reserved_1 */
NULL, /* reserved_2 */
(GtkClassInitFunc) NULL
@@ -186,16 +186,16 @@ gnome_selector_widget_get_type (void)
return type;
}
-extern GnomeSelectorWidget *
-gnome_selector_widget_do_construct (GnomeSelectorWidget *);
+extern GnomeComponentWidget *
+gnome_component_widget_do_construct (GnomeComponentWidget *);
-GnomeSelectorWidget *
-gnome_selector_widget_do_construct (GnomeSelectorWidget *widget)
+GnomeComponentWidget *
+gnome_component_widget_do_construct (GnomeComponentWidget *widget)
{
- GnomeSelectorWidgetPrivate *priv;
+ GnomeComponentWidgetPrivate *priv;
g_return_val_if_fail (widget != NULL, NULL);
- g_return_val_if_fail (GNOME_IS_SELECTOR_WIDGET (widget), NULL);
+ g_return_val_if_fail (GNOME_IS_COMPONENT_WIDGET (widget), NULL);
priv = widget->_priv;
@@ -258,16 +258,16 @@ gnome_selector_widget_do_construct (GnomeSelectorWidget *widget)
}
static GObject*
-gnome_selector_widget_constructor (GType type,
+gnome_component_widget_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{
- GObject *object = G_OBJECT_CLASS (gnome_selector_widget_parent_class)->
+ GObject *object = G_OBJECT_CLASS (gnome_component_widget_parent_class)->
constructor (type, n_construct_properties, construct_properties);
- GnomeSelectorWidget *widget = GNOME_SELECTOR_WIDGET (object);
+ GnomeComponentWidget *widget = GNOME_COMPONENT_WIDGET (object);
- if (type == GNOME_TYPE_SELECTOR_WIDGET)
- return (GObject *) gnome_selector_widget_do_construct (widget);
+ if (type == GNOME_TYPE_COMPONENT_WIDGET)
+ return (GObject *) gnome_component_widget_do_construct (widget);
else
return object;
}
diff --git a/libgnomeui/gnome-component-widget.h b/libgnomeui/gnome-component-widget.h
index a160458..a5f2b68 100644
--- a/libgnomeui/gnome-component-widget.h
+++ b/libgnomeui/gnome-component-widget.h
@@ -24,13 +24,13 @@
@NOTATION@
*/
-/* GnomeSelector widget
+/* GnomeComponent widget
*
* Author: Martin Baulig <baulig suse de>
*/
-#ifndef GNOME_SELECTOR_WIDGET_H
-#define GNOME_SELECTOR_WIDGET_H
+#ifndef GNOME_COMPONENT_WIDGET_H
+#define GNOME_COMPONENT_WIDGET_H
#include <bonobo/bonobo-widget.h>
@@ -40,30 +40,30 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SELECTOR_WIDGET (gnome_selector_widget_get_type ())
-#define GNOME_SELECTOR_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SELECTOR_WIDGET, GnomeSelectorWidget))
-#define GNOME_SELECTOR_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SELECTOR_WIDGET, GnomeSelectorWidgetClass))
-#define GNOME_IS_SELECTOR_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SELECTOR_WIDGET))
-#define GNOME_IS_SELECTOR_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SELECTOR_WIDGET))
+#define GNOME_TYPE_COMPONENT_WIDGET (gnome_component_widget_get_type ())
+#define GNOME_COMPONENT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_COMPONENT_WIDGET, GnomeComponentWidget))
+#define GNOME_COMPONENT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_COMPONENT_WIDGET, GnomeComponentWidgetClass))
+#define GNOME_IS_COMPONENT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_COMPONENT_WIDGET))
+#define GNOME_IS_COMPONENT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_COMPONENT_WIDGET))
-typedef struct _GnomeSelectorWidget GnomeSelectorWidget;
-typedef struct _GnomeSelectorWidgetPrivate GnomeSelectorWidgetPrivate;
-typedef struct _GnomeSelectorWidgetClass GnomeSelectorWidgetClass;
+typedef struct _GnomeComponentWidget GnomeComponentWidget;
+typedef struct _GnomeComponentWidgetPrivate GnomeComponentWidgetPrivate;
+typedef struct _GnomeComponentWidgetClass GnomeComponentWidgetClass;
-struct _GnomeSelectorWidget {
+struct _GnomeComponentWidget {
BonoboWidget widget;
/*< private >*/
- GnomeSelectorWidgetPrivate *_priv;
+ GnomeComponentWidgetPrivate *_priv;
};
-struct _GnomeSelectorWidgetClass {
+struct _GnomeComponentWidgetClass {
BonoboWidgetClass parent_class;
};
GtkType
-gnome_selector_widget_get_type (void) G_GNUC_CONST;
+gnome_component_widget_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/libgnomeui/gnome-entry.c b/libgnomeui/gnome-entry.c
index 6f00f81..4f3a80b 100644
--- a/libgnomeui/gnome-entry.c
+++ b/libgnomeui/gnome-entry.c
@@ -39,7 +39,6 @@
#include <gtk/gtklistitem.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-selector.h>
#include <bonobo/bonobo-exception.h>
#include "gnome-macros.h"
#include "gnome-entry.h"
@@ -62,7 +61,7 @@ gnome_entry_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
-static GnomeSelectorWidget *parent_class;
+static GnomeComponentWidget *parent_class;
enum {
PROP_0,
@@ -88,7 +87,7 @@ gnome_entry_get_type (void)
NULL
};
- entry_type = gtk_type_unique (gnome_selector_widget_get_type (), &entry_info);
+ entry_type = gtk_type_unique (gnome_component_widget_get_type (), &entry_info);
}
return entry_type;
@@ -146,7 +145,7 @@ gnome_entry_class_init (GnomeEntryClass *class)
object_class = (GtkObjectClass *) class;
gobject_class = (GObjectClass *) class;
- parent_class = gtk_type_class (gnome_selector_widget_get_type ());
+ parent_class = gtk_type_class (gnome_component_widget_get_type ());
gobject_class->get_property = gnome_entry_get_property;
gobject_class->set_property = gnome_entry_set_property;
@@ -170,7 +169,7 @@ gnome_entry_init (GnomeEntry *gentry)
gentry->_priv = g_new0 (GnomeEntryPrivate, 1);
}
-extern GnomeSelectorWidget *gnome_selector_widget_do_construct (GnomeSelectorWidget *);
+extern GnomeComponentWidget *gnome_component_widget_do_construct (GnomeComponentWidget *);
static GObject*
gnome_entry_constructor (GType type,
@@ -212,7 +211,7 @@ gnome_entry_constructor (GType type,
out:
g_free (moniker);
- if (!gnome_selector_widget_do_construct (GNOME_SELECTOR_WIDGET (gentry)))
+ if (!gnome_component_widget_do_construct (GNOME_COMPONENT_WIDGET (gentry)))
return NULL;
corba_objref = bonobo_widget_get_objref (BONOBO_WIDGET (gentry));
diff --git a/libgnomeui/gnome-entry.h b/libgnomeui/gnome-entry.h
index e6e33b7..23ddd63 100644
--- a/libgnomeui/gnome-entry.h
+++ b/libgnomeui/gnome-entry.h
@@ -33,8 +33,7 @@
#define GNOME_ENTRY_H
-#include <libgnome/gnome-selector.h>
-#include <libgnomeui/gnome-selector-widget.h>
+#include <libgnomeui/gnome-component-widget.h>
G_BEGIN_DECLS
@@ -53,14 +52,14 @@ typedef struct _GnomeEntryPrivate GnomeEntryPrivate;
typedef struct _GnomeEntryClass GnomeEntryClass;
struct _GnomeEntry {
- GnomeSelectorWidget widget;
+ GnomeComponentWidget widget;
/*< private >*/
GnomeEntryPrivate *_priv;
};
struct _GnomeEntryClass {
- GnomeSelectorWidgetClass parent_class;
+ GnomeComponentWidgetClass parent_class;
};
diff --git a/libgnomeui/gnome-image-entry.c b/libgnomeui/gnome-image-entry.c
index 81a9d04..05b396b 100644
--- a/libgnomeui/gnome-image-entry.c
+++ b/libgnomeui/gnome-image-entry.c
@@ -72,7 +72,7 @@ gnome_image_entry_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
-static GnomeSelectorWidgetClass *parent_class;
+static GnomeComponentWidgetClass *parent_class;
GType
gnome_image_entry_get_type (void)
@@ -91,7 +91,7 @@ gnome_image_entry_get_type (void)
NULL
};
- entry_type = gtk_type_unique (gnome_selector_widget_get_type (), &entry_info);
+ entry_type = gtk_type_unique (gnome_component_widget_get_type (), &entry_info);
}
return entry_type;
@@ -199,7 +199,7 @@ gnome_image_entry_init (GnomeImageEntry *gentry)
gentry->_priv = g_new0 (GnomeImageEntryPrivate, 1);
}
-extern GnomeSelectorWidget *gnome_selector_widget_do_construct (GnomeSelectorWidget *);
+extern GnomeComponentWidget *gnome_component_widget_do_construct (GnomeComponentWidget *);
static GObject*
gnome_image_entry_constructor (GType type,
@@ -244,7 +244,7 @@ gnome_image_entry_constructor (GType type,
out:
g_free (moniker);
- if (!gnome_selector_widget_do_construct (GNOME_SELECTOR_WIDGET (ientry)))
+ if (!gnome_component_widget_do_construct (GNOME_COMPONENT_WIDGET (ientry)))
return NULL;
return object;
diff --git a/libgnomeui/gnome-image-entry.h b/libgnomeui/gnome-image-entry.h
index 438f665..5b3bc40 100644
--- a/libgnomeui/gnome-image-entry.h
+++ b/libgnomeui/gnome-image-entry.h
@@ -33,8 +33,7 @@
#define GNOME_IMAGE_ENTRY_H
-#include <libgnome/gnome-selector.h>
-#include <libgnomeui/gnome-selector-widget.h>
+#include <libgnomeui/gnome-component-widget.h>
G_BEGIN_DECLS
@@ -52,14 +51,14 @@ typedef struct _GnomeImageEntryPrivate GnomeImageEntryPrivate;
typedef struct _GnomeImageEntryClass GnomeImageEntryClass;
struct _GnomeImageEntry {
- GnomeSelectorWidget widget;
+ GnomeComponentWidget widget;
/*< private >*/
GnomeImageEntryPrivate *_priv;
};
struct _GnomeImageEntryClass {
- GnomeSelectorWidgetClass parent_class;
+ GnomeComponentWidgetClass parent_class;
};
diff --git a/libgnomeui/gnome-image-selector.c b/libgnomeui/gnome-image-selector.c
index 245696a..5078f2b 100644
--- a/libgnomeui/gnome-image-selector.c
+++ b/libgnomeui/gnome-image-selector.c
@@ -56,7 +56,7 @@ gnome_image_selector_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
-static GnomeSelectorWidgetClass *parent_class;
+static GnomeComponentWidgetClass *parent_class;
GType
gnome_image_selector_get_type (void)
@@ -75,7 +75,7 @@ gnome_image_selector_get_type (void)
NULL
};
- selector_type = gtk_type_unique (gnome_selector_widget_get_type (), &selector_info);
+ selector_type = gtk_type_unique (gnome_component_widget_get_type (), &selector_info);
}
return selector_type;
@@ -88,7 +88,7 @@ gnome_image_selector_class_init (GnomeImageSelectorClass *class)
object_class = (GObjectClass *) class;
- parent_class = gtk_type_class (gnome_selector_widget_get_type ());
+ parent_class = gtk_type_class (gnome_component_widget_get_type ());
object_class->constructor = gnome_image_selector_constructor;
object_class->finalize = gnome_image_selector_finalize;
@@ -100,7 +100,7 @@ gnome_image_selector_init (GnomeImageSelector *gselector)
gselector->_priv = g_new0 (GnomeImageSelectorPrivate, 1);
}
-extern GnomeSelectorWidget *gnome_selector_widget_do_construct (GnomeSelectorWidget *);
+extern GnomeComponentWidget *gnome_component_widget_do_construct (GnomeComponentWidget *);
static GObject*
gnome_image_selector_constructor (GType type,
@@ -139,7 +139,7 @@ gnome_image_selector_constructor (GType type,
out:
g_free (moniker);
- if (!gnome_selector_widget_do_construct (GNOME_SELECTOR_WIDGET (iselector)))
+ if (!gnome_component_widget_do_construct (GNOME_COMPONENT_WIDGET (iselector)))
return NULL;
return object;
diff --git a/libgnomeui/gnome-image-selector.h b/libgnomeui/gnome-image-selector.h
index 5e8f012..16581f2 100644
--- a/libgnomeui/gnome-image-selector.h
+++ b/libgnomeui/gnome-image-selector.h
@@ -33,8 +33,7 @@
#define GNOME_IMAGE_SELECTOR_H
-#include <libgnome/gnome-selector.h>
-#include <libgnomeui/gnome-selector-widget.h>
+#include <libgnomeui/gnome-component-widget.h>
G_BEGIN_DECLS
@@ -52,14 +51,14 @@ typedef struct _GnomeImageSelectorPrivate GnomeImageSelectorPrivate;
typedef struct _GnomeImageSelectorClass GnomeImageSelectorClass;
struct _GnomeImageSelector {
- GnomeSelectorWidget widget;
+ GnomeComponentWidget widget;
/*< private >*/
GnomeImageSelectorPrivate *_priv;
};
struct _GnomeImageSelectorClass {
- GnomeSelectorWidgetClass parent_class;
+ GnomeComponentWidgetClass parent_class;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]