aboutsummaryrefslogtreecommitdiffstats
path: root/lib/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'lib/widgets')
-rw-r--r--lib/widgets/ephy-autocompletion-window.c33
-rw-r--r--lib/widgets/ephy-location-entry.c33
2 files changed, 52 insertions, 14 deletions
diff --git a/lib/widgets/ephy-autocompletion-window.c b/lib/widgets/ephy-autocompletion-window.c
index 1af4a7481..0f7a8fc1c 100644
--- a/lib/widgets/ephy-autocompletion-window.c
+++ b/lib/widgets/ephy-autocompletion-window.c
@@ -28,7 +28,6 @@
#include <gtk/gtkframe.h>
#include "ephy-autocompletion-window.h"
-#include "ephy-gobject-misc.h"
#include "ephy-string.h"
#include "ephy-marshal.h"
#include "ephy-gui.h"
@@ -100,13 +99,33 @@ enum EphyAutocompletionWindowSignalsEnum {
};
static gint EphyAutocompletionWindowSignals[EPHY_AUTOCOMPLETION_WINDOW_LAST_SIGNAL];
-/**
- * AutocompletionWindow object
- */
+GType
+ephy_autocompletion_window_get_type (void)
+{
+ static GType ephy_autocompletion_window_type = 0;
+
+ if (ephy_autocompletion_window_type == 0)
+ {
+ static const GTypeInfo our_info =
+ {
+ sizeof (EphyAutocompletionWindowClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) ephy_autocompletion_window_class_init,
+ NULL,
+ NULL,
+ sizeof (EphyAutocompletionWindow),
+ 0,
+ (GInstanceInitFunc) ephy_autocompletion_window_init
+ };
+
+ ephy_autocompletion_window_type = g_type_register_static (G_TYPE_OBJECT,
+ "EphyAutocompletionWindow",
+ &our_info, 0);
+ }
-MAKE_GET_TYPE (ephy_autocompletion_window, "EphyAutocompletionWindow", EphyAutocompletionWindow,
- ephy_autocompletion_window_class_init,
- ephy_autocompletion_window_init, G_TYPE_OBJECT);
+ return ephy_autocompletion_window_type;
+}
static void
ephy_autocompletion_window_class_init (EphyAutocompletionWindowClass *klass)
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 94c696ba8..9488c7c11 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -19,7 +19,6 @@
#include "ephy-location-entry.h"
#include "ephy-autocompletion-window.h"
#include "ephy-marshal.h"
-#include "ephy-gobject-misc.h"
#include "eel-gconf-extensions.h"
#include "ephy-prefs.h"
#include "ephy-debug.h"
@@ -109,13 +108,33 @@ enum EphyLocationEntrySignalsEnum {
};
static gint EphyLocationEntrySignals[LAST_SIGNAL];
-/**
- * EphyLocationEntry object
- */
+GType
+ephy_location_entry_get_type (void)
+{
+ static GType ephy_location_entry_type = 0;
+
+ if (ephy_location_entry_type == 0)
+ {
+ static const GTypeInfo our_info =
+ {
+ sizeof (EphyLocationEntryClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) ephy_location_entry_class_init,
+ NULL,
+ NULL,
+ sizeof (EphyLocationEntry),
+ 0,
+ (GInstanceInitFunc) ephy_location_entry_init
+ };
+
+ ephy_location_entry_type = g_type_register_static (GTK_TYPE_HBOX,
+ "EphyLocationEntry",
+ &our_info, 0);
+ }
-MAKE_GET_TYPE (ephy_location_entry, "EphyLocationEntry", EphyLocationEntry,
- ephy_location_entry_class_init,
- ephy_location_entry_init, GTK_TYPE_HBOX);
+ return ephy_location_entry_type;
+}
static void
ephy_location_entry_class_init (EphyLocationEntryClass *klass)