GNOME.org
 

[network-manager-openswan/lr/libnm: 4/10] properties: rename the classes to be more libnm-ish

commit c6b6fceb59bb4af2f17f537aac3e937a4954e0a4
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Jul 15 18:47:53 2015 +0200

    properties: rename the classes to be more libnm-ish
    
    No functional change.

 properties/nm-openswan.c |  108 +++++++++++++++++++++++-----------------------
 properties/nm-openswan.h |   44 +++++++++---------
 2 files changed, 76 insertions(+), 76 deletions(-)
---
diff --git a/properties/nm-openswan.c b/properties/nm-openswan.c
index 2b08972..69429e6 100644
--- a/properties/nm-openswan.c
+++ b/properties/nm-openswan.c
@@ -44,8 +44,8 @@
 #define OPENSWAN_PLUGIN_NAME    _("IPsec based VPN")
 #define OPENSWAN_PLUGIN_DESC    _("IPsec, IKEv1, IKEv2 based VPN")
 
-#define OPENSWAN_PLUGIN_UI_ERROR                  NM_SETTING_VPN_ERROR
-#define OPENSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
+#define OPENSWAN_EDITOR_PLUGIN_ERROR                  NM_SETTING_VPN_ERROR
+#define OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
 
 #else /* !NM_OPENSWAN_OLD */
 
@@ -54,8 +54,8 @@
 #define OPENSWAN_PLUGIN_NAME    _("openswan")
 #define OPENSWAN_PLUGIN_DESC    _("IPsec based VPN")
 
-#define OPENSWAN_PLUGIN_UI_ERROR                  NM_CONNECTION_ERROR
-#define OPENSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY NM_CONNECTION_ERROR_INVALID_PROPERTY
+#define OPENSWAN_EDITOR_PLUGIN_ERROR                  NM_CONNECTION_ERROR
+#define OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_CONNECTION_ERROR_INVALID_PROPERTY
 #endif
 
 #include "nm-openswan-service.h"
@@ -78,33 +78,33 @@ enum {
        PROP_SERVICE
 };
 
-static void openswan_plugin_ui_interface_init (NMVpnEditorPluginInterface *iface_class);
+static void openswan_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_class);
 
-G_DEFINE_TYPE_EXTENDED (OpenswanPluginUi, openswan_plugin_ui, G_TYPE_OBJECT, 0,
+G_DEFINE_TYPE_EXTENDED (OpenswanEditorPlugin, openswan_editor_plugin, G_TYPE_OBJECT, 0,
                         G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_EDITOR_PLUGIN,
-                                               openswan_plugin_ui_interface_init))
+                                               openswan_editor_plugin_interface_init))
 
 /************** UI widget class **************/
 
-static void openswan_plugin_ui_widget_interface_init (NMVpnEditorInterface *iface_class);
+static void openswan_editor_interface_init (NMVpnEditorInterface *iface_class);
 
-G_DEFINE_TYPE_EXTENDED (OpenswanPluginUiWidget, openswan_plugin_ui_widget, G_TYPE_OBJECT, 0,
+G_DEFINE_TYPE_EXTENDED (OpenswanEditor, openswan_editor, G_TYPE_OBJECT, 0,
                         G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_EDITOR,
-                                               openswan_plugin_ui_widget_interface_init))
+                                               openswan_editor_interface_init))
 
-#define OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
OPENSWAN_TYPE_PLUGIN_UI_WIDGET, OpenswanPluginUiWidgetPrivate))
+#define OPENSWAN_EDITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OPENSWAN_TYPE_EDITOR, 
OpenswanEditorPrivate))
 
 typedef struct {
        GtkBuilder *builder;
        GtkWidget *widget;
        GtkSizeGroup *group;
-} OpenswanPluginUiWidgetPrivate;
+} OpenswanEditorPrivate;
 
 
 static gboolean
-check_validity (OpenswanPluginUiWidget *self, GError **error)
+check_validity (OpenswanEditor *self, GError **error)
 {
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
        GtkWidget *widget;
        char *str;
 
@@ -112,8 +112,8 @@ check_validity (OpenswanPluginUiWidget *self, GError **error)
        str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
        if (!str || !strlen (str) || strstr (str, " ") || strstr (str, "\t")) {
                g_set_error (error,
-                            OPENSWAN_PLUGIN_UI_ERROR,
-                            OPENSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY,
+                            OPENSWAN_EDITOR_PLUGIN_ERROR,
+                            OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
                             NM_OPENSWAN_RIGHT);
                return FALSE;
        }
@@ -122,8 +122,8 @@ check_validity (OpenswanPluginUiWidget *self, GError **error)
        str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
        if (!str || !strlen (str)) {
                g_set_error (error,
-                            OPENSWAN_PLUGIN_UI_ERROR,
-                            OPENSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY,
+                            OPENSWAN_EDITOR_PLUGIN_ERROR,
+                            OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
                             NM_OPENSWAN_LEFTID);
                return FALSE;
        }
@@ -134,17 +134,17 @@ check_validity (OpenswanPluginUiWidget *self, GError **error)
 static void
 stuff_changed_cb (GtkWidget *widget, gpointer user_data)
 {
-       g_signal_emit_by_name (OPENSWAN_PLUGIN_UI_WIDGET (user_data), "changed");
+       g_signal_emit_by_name (OPENSWAN_EDITOR (user_data), "changed");
 }
 
 static void
-setup_password_widget (OpenswanPluginUiWidget *self,
+setup_password_widget (OpenswanEditor *self,
                        const char *entry_name,
                        NMSettingVpn *s_vpn,
                        const char *secret_name,
                        gboolean new_connection)
 {
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
        NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
        GtkWidget *widget;
        const char *value;
@@ -168,9 +168,9 @@ setup_password_widget (OpenswanPluginUiWidget *self,
 }
 
 static void
-show_toggled_cb (GtkCheckButton *button, OpenswanPluginUiWidget *self)
+show_toggled_cb (GtkCheckButton *button, OpenswanEditor *self)
 {
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
        GtkWidget *widget;
        gboolean visible;
 
@@ -186,9 +186,9 @@ show_toggled_cb (GtkCheckButton *button, OpenswanPluginUiWidget *self)
 }
 
 static void
-pw_type_changed_helper (OpenswanPluginUiWidget *self, GtkWidget *combo)
+pw_type_changed_helper (OpenswanEditor *self, GtkWidget *combo)
 {
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
        const char *entry = NULL;
        GtkWidget *widget;
 
@@ -224,7 +224,7 @@ pw_type_changed_helper (OpenswanPluginUiWidget *self, GtkWidget *combo)
 static void
 pw_type_combo_changed_cb (GtkWidget *combo, gpointer user_data)
 {
-       OpenswanPluginUiWidget *self = OPENSWAN_PLUGIN_UI_WIDGET (user_data);
+       OpenswanEditor *self = OPENSWAN_EDITOR (user_data);
 
        pw_type_changed_helper (self, combo);
        stuff_changed_cb (combo, self);
@@ -246,14 +246,14 @@ secret_flags_to_pw_type (NMSettingVpn *s_vpn, const char *key)
 }
 
 static void
-init_one_pw_combo (OpenswanPluginUiWidget *self,
+init_one_pw_combo (OpenswanEditor *self,
                    NMSettingVpn *s_vpn,
                    const char *combo_name,
                    const char *secret_key,
                    const char *type_key,
                    const char *entry_name)
 {
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
        int active = -1;
        GtkWidget *widget;
        GtkListStore *store;
@@ -313,12 +313,12 @@ init_one_pw_combo (OpenswanPluginUiWidget *self,
 
 
 static gboolean
-init_plugin_ui (OpenswanPluginUiWidget *self,
+init_editor_plugin (OpenswanEditor *self,
                 NMConnection *connection,
                 gboolean new_connection,
                 GError **error)
 {
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
        NMSettingVpn *s_vpn = NULL;
        GtkWidget *widget;
        const char *value = NULL;
@@ -428,8 +428,8 @@ init_plugin_ui (OpenswanPluginUiWidget *self,
 static GObject *
 get_widget (NMVpnEditor *iface)
 {
-       OpenswanPluginUiWidget *self = OPENSWAN_PLUGIN_UI_WIDGET (iface);
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       OpenswanEditor *self = OPENSWAN_EDITOR (iface);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
 
        return G_OBJECT (priv->widget);
 }
@@ -478,8 +478,8 @@ update_connection (NMVpnEditor *iface,
                    NMConnection *connection,
                    GError **error)
 {
-       OpenswanPluginUiWidget *self = OPENSWAN_PLUGIN_UI_WIDGET (iface);
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       OpenswanEditor *self = OPENSWAN_EDITOR (iface);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (self);
        NMSettingVpn *s_vpn;
        GtkWidget *widget;
        char *str;
@@ -553,10 +553,10 @@ is_new_func (const char *key, const char *value, gpointer user_data)
 }
 
 static NMVpnEditor *
-nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
+nm_vpn_editor_interface_new (NMConnection *connection, GError **error)
 {
        NMVpnEditor *object;
-       OpenswanPluginUiWidgetPrivate *priv;
+       OpenswanEditorPrivate *priv;
        char *ui_file;
        NMSettingVpn *s_vpn;
        gboolean is_new = TRUE;
@@ -564,13 +564,13 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
        if (error)
                g_return_val_if_fail (*error == NULL, NULL);
 
-       object = g_object_new (OPENSWAN_TYPE_PLUGIN_UI_WIDGET, NULL);
+       object = g_object_new (OPENSWAN_TYPE_EDITOR, NULL);
        if (!object) {
-               g_set_error (error, OPENSWAN_PLUGIN_UI_ERROR, 0, "could not create openswan object");
+               g_set_error (error, OPENSWAN_EDITOR_PLUGIN_ERROR, 0, "could not create openswan object");
                return NULL;
        }
 
-       priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (object);
+       priv = OPENSWAN_EDITOR_GET_PRIVATE (object);
 
        ui_file = g_strdup_printf ("%s/%s", UIDIR, "nm-openswan-dialog.ui");
        priv->builder = gtk_builder_new ();
@@ -582,7 +582,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
                g_warning ("Couldn't load builder file: %s",
                           error && *error ? (*error)->message : "(unknown)");
                g_clear_error (error);
-               g_set_error (error, OPENSWAN_PLUGIN_UI_ERROR, 0,
+               g_set_error (error, OPENSWAN_EDITOR_PLUGIN_ERROR, 0,
                             "could not load required resources at %s", ui_file);
                g_free (ui_file);
                g_object_unref (object);
@@ -592,7 +592,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
 
        priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "openswan-vbox"));
        if (!priv->widget) {
-               g_set_error (error, OPENSWAN_PLUGIN_UI_ERROR, 0, "could not load UI widget");
+               g_set_error (error, OPENSWAN_EDITOR_PLUGIN_ERROR, 0, "could not load UI widget");
                g_object_unref (object);
                return NULL;
        }
@@ -602,7 +602,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
        if (s_vpn)
                nm_setting_vpn_foreach_data_item (s_vpn, is_new_func, &is_new);
 
-       if (!init_plugin_ui (OPENSWAN_PLUGIN_UI_WIDGET (object), connection, is_new, error)) {
+       if (!init_editor_plugin (OPENSWAN_EDITOR (object), connection, is_new, error)) {
                g_object_unref (object);
                return NULL;
        }
@@ -613,8 +613,8 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
 static void
 dispose (GObject *object)
 {
-       OpenswanPluginUiWidget *plugin = OPENSWAN_PLUGIN_UI_WIDGET (object);
-       OpenswanPluginUiWidgetPrivate *priv = OPENSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (plugin);
+       OpenswanEditor *plugin = OPENSWAN_EDITOR (object);
+       OpenswanEditorPrivate *priv = OPENSWAN_EDITOR_GET_PRIVATE (plugin);
 
        if (priv->group)
                g_object_unref (priv->group);
@@ -625,26 +625,26 @@ dispose (GObject *object)
        if (priv->builder)
                g_object_unref (priv->builder);
 
-       G_OBJECT_CLASS (openswan_plugin_ui_widget_parent_class)->dispose (object);
+       G_OBJECT_CLASS (openswan_editor_parent_class)->dispose (object);
 }
 
 static void
-openswan_plugin_ui_widget_class_init (OpenswanPluginUiWidgetClass *req_class)
+openswan_editor_class_init (OpenswanEditorClass *req_class)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (req_class);
 
-       g_type_class_add_private (req_class, sizeof (OpenswanPluginUiWidgetPrivate));
+       g_type_class_add_private (req_class, sizeof (OpenswanEditorPrivate));
 
        object_class->dispose = dispose;
 }
 
 static void
-openswan_plugin_ui_widget_init (OpenswanPluginUiWidget *plugin)
+openswan_editor_init (OpenswanEditor *plugin)
 {
 }
 
 static void
-openswan_plugin_ui_widget_interface_init (NMVpnEditorInterface *iface_class)
+openswan_editor_interface_init (NMVpnEditorInterface *iface_class)
 {
        /* interface implementation */
        iface_class->get_widget = get_widget;
@@ -660,7 +660,7 @@ get_capabilities (NMVpnEditorPlugin *iface)
 static NMVpnEditor *
 get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
 {
-       return nm_vpn_plugin_ui_widget_interface_new (connection, error);
+       return nm_vpn_editor_interface_new (connection, error);
 }
 
 static void
@@ -684,7 +684,7 @@ get_property (GObject *object, guint prop_id,
 }
 
 static void
-openswan_plugin_ui_class_init (OpenswanPluginUiClass *req_class)
+openswan_editor_plugin_class_init (OpenswanEditorPluginClass *req_class)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (req_class);
 
@@ -704,12 +704,12 @@ openswan_plugin_ui_class_init (OpenswanPluginUiClass *req_class)
 }
 
 static void
-openswan_plugin_ui_init (OpenswanPluginUi *plugin)
+openswan_editor_plugin_init (OpenswanEditorPlugin *plugin)
 {
 }
 
 static void
-openswan_plugin_ui_interface_init (NMVpnEditorPluginInterface *iface_class)
+openswan_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_class)
 {
        /* interface implementation */
        iface_class->get_editor = get_editor;
@@ -729,6 +729,6 @@ nm_vpn_editor_plugin_factory (GError **error)
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-       return g_object_new (OPENSWAN_TYPE_PLUGIN_UI, NULL);
+       return g_object_new (OPENSWAN_TYPE_EDITOR_PLUGIN, NULL);
 }
 
diff --git a/properties/nm-openswan.h b/properties/nm-openswan.h
index d39798a..7e37ad9 100644
--- a/properties/nm-openswan.h
+++ b/properties/nm-openswan.h
@@ -26,46 +26,46 @@
 
 #include <glib-object.h>
 
-#define OPENSWAN_TYPE_PLUGIN_UI            (openswan_plugin_ui_get_type ())
-#define OPENSWAN_PLUGIN_UI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), OPENSWAN_TYPE_PLUGIN_UI, 
OpenswanPluginUi))
-#define OPENSWAN_PLUGIN_UI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), OPENSWAN_TYPE_PLUGIN_UI, 
OpenswanPluginUiClass))
-#define OPENSWAN_IS_PLUGIN_UI(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OPENSWAN_TYPE_PLUGIN_UI))
-#define OPENSWAN_IS_PLUGIN_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), OPENSWAN_TYPE_PLUGIN_UI))
-#define OPENSWAN_PLUGIN_UI_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), OPENSWAN_TYPE_PLUGIN_UI, 
OpenswanPluginUiClass))
+#define OPENSWAN_TYPE_EDITOR_PLUGIN            (openswan_editor_plugin_get_type ())
+#define OPENSWAN_EDITOR_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
OPENSWAN_TYPE_EDITOR_PLUGIN, OpenswanEditorPlugin))
+#define OPENSWAN_EDITOR_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
OPENSWAN_TYPE_EDITOR_PLUGIN, OpenswanEditorPluginClass))
+#define OPENSWAN_IS_EDITOR_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
OPENSWAN_TYPE_EDITOR_PLUGIN))
+#define OPENSWAN_IS_EDITOR_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), OPENSWAN_TYPE_EDITOR_PLUGIN))
+#define OPENSWAN_EDITOR_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
OPENSWAN_TYPE_EDITOR_PLUGIN, OpenswanEditorPluginClass))
 
-typedef struct _OpenswanPluginUi OpenswanPluginUi;
-typedef struct _OpenswanPluginUiClass OpenswanPluginUiClass;
+typedef struct _OpenswanEditorPlugin OpenswanEditorPlugin;
+typedef struct _OpenswanEditorPluginClass OpenswanEditorPluginClass;
 
-struct _OpenswanPluginUi {
+struct _OpenswanEditorPlugin {
        GObject parent;
 };
 
-struct _OpenswanPluginUiClass {
+struct _OpenswanEditorPluginClass {
        GObjectClass parent;
 };
 
-GType openswan_plugin_ui_get_type (void);
+GType openswan_editor_plugin_get_type (void);
 
 
-#define OPENSWAN_TYPE_PLUGIN_UI_WIDGET            (openswan_plugin_ui_widget_get_type ())
-#define OPENSWAN_PLUGIN_UI_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
OPENSWAN_TYPE_PLUGIN_UI_WIDGET, OpenswanPluginUiWidget))
-#define OPENSWAN_PLUGIN_UI_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
OPENSWAN_TYPE_PLUGIN_UI_WIDGET, OpenswanPluginUiWidgetClass))
-#define OPENSWAN_IS_PLUGIN_UI_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
OPENSWAN_TYPE_PLUGIN_UI_WIDGET))
-#define OPENSWAN_IS_PLUGIN_UI_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), 
OPENSWAN_TYPE_PLUGIN_UI_WIDGET))
-#define OPENSWAN_PLUGIN_UI_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
OPENSWAN_TYPE_PLUGIN_UI_WIDGET, OpenswanPluginUiWidgetClass))
+#define OPENSWAN_TYPE_EDITOR            (openswan_editor_get_type ())
+#define OPENSWAN_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), OPENSWAN_TYPE_EDITOR, 
OpenswanEditor))
+#define OPENSWAN_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), OPENSWAN_TYPE_EDITOR, 
OpenswanEditorClass))
+#define OPENSWAN_IS_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OPENSWAN_TYPE_EDITOR))
+#define OPENSWAN_IS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), OPENSWAN_TYPE_EDITOR))
+#define OPENSWAN_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), OPENSWAN_TYPE_EDITOR, 
OpenswanEditorClass))
 
-typedef struct _OpenswanPluginUiWidget OpenswanPluginUiWidget;
-typedef struct _OpenswanPluginUiWidgetClass OpenswanPluginUiWidgetClass;
+typedef struct _OpenswanEditor OpenswanEditor;
+typedef struct _OpenswanEditorClass OpenswanEditorClass;
 
-struct _OpenswanPluginUiWidget {
+struct _OpenswanEditor {
        GObject parent;
 };
 
-struct _OpenswanPluginUiWidgetClass {
+struct _OpenswanEditorClass {
        GObjectClass parent;
 };
 
-GType openswan_plugin_ui_widget_get_type (void);
+GType openswan_editor_get_type (void);
 
 #endif /* _NM_OPENSWAN_H_ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]