GNOME.org
 

[network-manager-iodine/lr/libnm: 7/11] properties: rename the classes to be more libnm-ish

commit ce30412a761e450ac9be1cb52ace882d33163590
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Aug 24 17:17:57 2015 +0200

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

 properties/nm-iodine.c |  108 ++++++++++++++++++++++++------------------------
 properties/nm-iodine.h |   44 ++++++++++----------
 2 files changed, 76 insertions(+), 76 deletions(-)
---
diff --git a/properties/nm-iodine.c b/properties/nm-iodine.c
index 701b76f..a0a51de 100644
--- a/properties/nm-iodine.c
+++ b/properties/nm-iodine.c
@@ -42,16 +42,16 @@
 
 #define nm_simple_connection_new nm_connection_new
 
-#define IODINE_PLUGIN_UI_ERROR                     NM_SETTING_VPN_ERROR
-#define IODINE_PLUGIN_UI_ERROR_INVALID_PROPERTY    NM_SETTING_VPN_ERROR_INVALID_PROPERTY
+#define IODINE_EDITOR_PLUGIN_ERROR                     NM_SETTING_VPN_ERROR
+#define IODINE_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_SETTING_VPN_ERROR_INVALID_PROPERTY
  
 #else /* !NM_IODINE_OLD */
 
 #include <NetworkManager.h>
 #include <nma-ui-utils.h>
 
-#define IODINE_PLUGIN_UI_ERROR                     NM_CONNECTION_ERROR
-#define IODINE_PLUGIN_UI_ERROR_INVALID_PROPERTY    NM_CONNECTION_ERROR_INVALID_PROPERTY
+#define IODINE_EDITOR_PLUGIN_ERROR                     NM_CONNECTION_ERROR
+#define IODINE_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_CONNECTION_ERROR_INVALID_PROPERTY
 #endif
 
 #include "nm-iodine-service-defines.h"
@@ -74,28 +74,28 @@ enum {
        PROP_SERVICE
 };
 
-static void iodine_plugin_ui_interface_init (NMVpnEditorPluginInterface *iface_class);
+static void iodine_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_class);
 
-G_DEFINE_TYPE_EXTENDED (IodinePluginUi, iodine_plugin_ui, G_TYPE_OBJECT, 0,
+G_DEFINE_TYPE_EXTENDED (IodineEditorPlugin, iodine_editor_plugin, G_TYPE_OBJECT, 0,
                         G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_EDITOR_PLUGIN,
-                                               iodine_plugin_ui_interface_init))
+                                               iodine_editor_plugin_interface_init))
 
 /************** UI widget class **************/
 
-static void iodine_plugin_ui_widget_interface_init (NMVpnEditorInterface *iface_class);
+static void iodine_editor_interface_init (NMVpnEditorInterface *iface_class);
 
-G_DEFINE_TYPE_EXTENDED (IodinePluginUiWidget, iodine_plugin_ui_widget,G_TYPE_OBJECT, 0,
+G_DEFINE_TYPE_EXTENDED (IodineEditor, iodine_editor,G_TYPE_OBJECT, 0,
                         G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_EDITOR,
-                                               iodine_plugin_ui_widget_interface_init))
+                                               iodine_editor_interface_init))
 
-#define IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
IODINE_TYPE_PLUGIN_UI_WIDGET, IodinePluginUiWidgetPrivate))
+#define IODINE_EDITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IODINE_TYPE_EDITOR, 
IodineEditorPrivate))
 
 typedef struct {
        GtkBuilder *builder;
        GtkWidget *widget;
        GtkSizeGroup *group;
        gboolean window_added;
-} IodinePluginUiWidgetPrivate;
+} IodineEditorPrivate;
 
 typedef enum {
        NM_IODINE_IMPORT_EXPORT_ERROR_UNKNOWN = 0,
@@ -249,10 +249,10 @@ done:
 }
 
 static gboolean
-check_validity (IodinePluginUiWidget *self, GError **error)
+check_validity (IodineEditor *self, GError **error)
 {
-       IodinePluginUiWidgetPrivate *priv = \
-               IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       IodineEditorPrivate *priv = \
+               IODINE_EDITOR_GET_PRIVATE (self);
        GtkWidget *widget;
        const char *str;
 
@@ -260,8 +260,8 @@ check_validity (IodinePluginUiWidget *self, GError **error)
        str = gtk_entry_get_text (GTK_ENTRY (widget));
        if (!str || !strlen (str)) {
                g_set_error (error,
-                            IODINE_PLUGIN_UI_ERROR,
-                            IODINE_PLUGIN_UI_ERROR_INVALID_PROPERTY,
+                            IODINE_EDITOR_PLUGIN_ERROR,
+                            IODINE_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
                             NM_IODINE_KEY_TOPDOMAIN);
                return FALSE;
        }
@@ -272,17 +272,17 @@ check_validity (IodinePluginUiWidget *self, GError **error)
 static void
 stuff_changed_cb (GtkWidget *widget, gpointer user_data)
 {
-       g_signal_emit_by_name (IODINE_PLUGIN_UI_WIDGET (user_data), "changed");
+       g_signal_emit_by_name (IODINE_EDITOR (user_data), "changed");
 }
 
 static void
-setup_password_widget (IodinePluginUiWidget *self,
+setup_password_widget (IodineEditor *self,
                        const char *entry_name,
                        NMSettingVpn *s_vpn,
                        const char *secret_name)
 {
-       IodinePluginUiWidgetPrivate *priv = \
-               IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       IodineEditorPrivate *priv = \
+               IODINE_EDITOR_GET_PRIVATE (self);
 
        NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
        GtkWidget *widget;
@@ -315,9 +315,9 @@ setup_password_widget (IodinePluginUiWidget *self,
 }
 
 static void
-show_toggled_cb (GtkCheckButton *button, IodinePluginUiWidget *self)
+show_toggled_cb (GtkCheckButton *button, IodineEditor *self)
 {
-       IodinePluginUiWidgetPrivate *priv = IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       IodineEditorPrivate *priv = IODINE_EDITOR_GET_PRIVATE (self);
        GtkWidget *widget;
        gboolean visible;
 
@@ -331,8 +331,8 @@ show_toggled_cb (GtkCheckButton *button, IodinePluginUiWidget *self)
 static void
 pw_type_combo_changed_cb (GtkWidget *combo, gpointer user_data)
 {
-       IodinePluginUiWidget *self = IODINE_PLUGIN_UI_WIDGET (user_data);
-       IodinePluginUiWidgetPrivate *priv = IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       IodineEditor *self = IODINE_EDITOR (user_data);
+       IodineEditorPrivate *priv = IODINE_EDITOR_GET_PRIVATE (self);
        GtkWidget *entry;
 
        entry = GTK_WIDGET (gtk_builder_get_object (priv->builder, "password_entry"));
@@ -356,13 +356,13 @@ pw_type_combo_changed_cb (GtkWidget *combo, gpointer user_data)
 }
 
 static void
-init_one_pw_combo (IodinePluginUiWidget *self,
+init_one_pw_combo (IodineEditor *self,
                    NMSettingVpn *s_vpn,
                    const char *combo_name,
                    const char *secret_key,
                    const char *entry_name)
 {
-       IodinePluginUiWidgetPrivate *priv = IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       IodineEditorPrivate *priv = IODINE_EDITOR_GET_PRIVATE (self);
        int active = -1;
        GtkWidget *widget;
        GtkListStore *store;
@@ -411,11 +411,11 @@ init_one_pw_combo (IodinePluginUiWidget *self,
 }
 
 static gboolean
-init_plugin_ui (IodinePluginUiWidget *self,
+init_editor_plugin (IodineEditor *self,
                 NMConnection *connection,
                 GError **error)
 {
-       IodinePluginUiWidgetPrivate *priv = IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       IodineEditorPrivate *priv = IODINE_EDITOR_GET_PRIVATE (self);
        NMSettingVpn *s_vpn;
        GtkWidget *widget;
        const char *value;
@@ -483,8 +483,8 @@ init_plugin_ui (IodinePluginUiWidget *self,
 static GObject *
 get_widget (NMVpnEditor *iface)
 {
-       IodinePluginUiWidget *self = IODINE_PLUGIN_UI_WIDGET (iface);
-       IodinePluginUiWidgetPrivate *priv = IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       IodineEditor *self = IODINE_EDITOR (iface);
+       IodineEditorPrivate *priv = IODINE_EDITOR_GET_PRIVATE (self);
 
        return G_OBJECT (priv->widget);
 }
@@ -532,8 +532,8 @@ update_connection (NMVpnEditor *iface,
                    NMConnection *connection,
                    GError **error)
 {
-       IodinePluginUiWidget *self = IODINE_PLUGIN_UI_WIDGET (iface);
-       IodinePluginUiWidgetPrivate *priv = IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+       IodineEditor *self = IODINE_EDITOR (iface);
+       IodineEditorPrivate *priv = IODINE_EDITOR_GET_PRIVATE (self);
        NMSettingVpn *s_vpn;
        GtkWidget *widget;
        char *str;
@@ -576,24 +576,24 @@ update_connection (NMVpnEditor *iface,
 }
 
 static NMVpnEditor *
-nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
+nm_vpn_editor_interface_new (NMConnection *connection, GError **error)
 {
        NMVpnEditor *object;
-       IodinePluginUiWidgetPrivate *priv;
+       IodineEditorPrivate *priv;
        char *ui_file;
 
        if (error)
                g_return_val_if_fail (*error == NULL, NULL);
 
-       object = g_object_new (IODINE_TYPE_PLUGIN_UI_WIDGET, NULL);
+       object = g_object_new (IODINE_TYPE_EDITOR, NULL);
 
        if (!object) {
-               g_set_error (error, IODINE_PLUGIN_UI_ERROR, 0,
+               g_set_error (error, IODINE_EDITOR_PLUGIN_ERROR, 0,
                             "could not create iodine object");
                return NULL;
        }
 
-       priv = IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (object);
+       priv = IODINE_EDITOR_GET_PRIVATE (object);
        ui_file = g_strdup_printf ("%s/%s", UIDIR, "nm-iodine-dialog.ui");
        priv->builder = gtk_builder_new ();
 
@@ -602,7 +602,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, IODINE_PLUGIN_UI_ERROR, 0,
+               g_set_error (error, IODINE_EDITOR_PLUGIN_ERROR, 0,
                             "could not load required resources at %s", ui_file);
                g_free (ui_file);
                g_object_unref (object);
@@ -612,14 +612,14 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
 
        priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "iodine-vbox"));
        if (!priv->widget) {
-               g_set_error (error, IODINE_PLUGIN_UI_ERROR, 0,
+               g_set_error (error, IODINE_EDITOR_PLUGIN_ERROR, 0,
                             "could not load UI widget");
                g_object_unref (object);
                return NULL;
        }
        g_object_ref_sink (priv->widget);
 
-       if (!init_plugin_ui (IODINE_PLUGIN_UI_WIDGET (object), connection, error)) {
+       if (!init_editor_plugin (IODINE_EDITOR (object), connection, error)) {
                g_object_unref (object);
                return NULL;
        }
@@ -630,9 +630,9 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
 static void
 dispose (GObject *object)
 {
-       IodinePluginUiWidget *plugin = IODINE_PLUGIN_UI_WIDGET (object);
-       IodinePluginUiWidgetPrivate *priv = \
-               IODINE_PLUGIN_UI_WIDGET_GET_PRIVATE (plugin);
+       IodineEditor *plugin = IODINE_EDITOR (object);
+       IodineEditorPrivate *priv = \
+               IODINE_EDITOR_GET_PRIVATE (plugin);
 
        if (priv->group)
                g_object_unref (priv->group);
@@ -643,26 +643,26 @@ dispose (GObject *object)
        if (priv->builder)
                g_object_unref (priv->builder);
 
-       G_OBJECT_CLASS (iodine_plugin_ui_widget_parent_class)->dispose (object);
+       G_OBJECT_CLASS (iodine_editor_parent_class)->dispose (object);
 }
 
 static void
-iodine_plugin_ui_widget_class_init (IodinePluginUiWidgetClass *req_class)
+iodine_editor_class_init (IodineEditorClass *req_class)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (req_class);
 
-       g_type_class_add_private (req_class, sizeof (IodinePluginUiWidgetPrivate));
+       g_type_class_add_private (req_class, sizeof (IodineEditorPrivate));
 
        object_class->dispose = dispose;
 }
 
 static void
-iodine_plugin_ui_widget_init (IodinePluginUiWidget *plugin)
+iodine_editor_init (IodineEditor *plugin)
 {
 }
 
 static void
-iodine_plugin_ui_widget_interface_init (NMVpnEditorInterface *iface_class)
+iodine_editor_interface_init (NMVpnEditorInterface *iface_class)
 {
        /* interface implementation */
        iface_class->get_widget = get_widget;
@@ -681,7 +681,7 @@ 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
@@ -705,7 +705,7 @@ get_property (GObject *object, guint prop_id,
 }
 
 static void
-iodine_plugin_ui_class_init (IodinePluginUiClass *req_class)
+iodine_editor_plugin_class_init (IodineEditorPluginClass *req_class)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (req_class);
 
@@ -725,12 +725,12 @@ iodine_plugin_ui_class_init (IodinePluginUiClass *req_class)
 }
 
 static void
-iodine_plugin_ui_init (IodinePluginUi *plugin)
+iodine_editor_plugin_init (IodineEditorPlugin *plugin)
 {
 }
 
 static void
-iodine_plugin_ui_interface_init (NMVpnEditorPluginInterface *iface_class)
+iodine_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_class)
 {
        /* interface implementation */
        iface_class->get_editor = get_editor;
@@ -745,5 +745,5 @@ nm_vpn_editor_plugin_factory (GError **error)
        if (error)
                g_return_val_if_fail (*error == NULL, NULL);
 
-       return g_object_new (IODINE_TYPE_PLUGIN_UI, NULL);
+       return g_object_new (IODINE_TYPE_EDITOR_PLUGIN, NULL);
 }
diff --git a/properties/nm-iodine.h b/properties/nm-iodine.h
index 45c583f..4eeb892 100644
--- a/properties/nm-iodine.h
+++ b/properties/nm-iodine.h
@@ -24,46 +24,46 @@
 
 #include <glib-object.h>
 
-#define IODINE_TYPE_PLUGIN_UI            (iodine_plugin_ui_get_type ())
-#define IODINE_PLUGIN_UI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), IODINE_TYPE_PLUGIN_UI, 
IodinePluginUi))
-#define IODINE_PLUGIN_UI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), IODINE_TYPE_PLUGIN_UI, 
IodinePluginUiClass))
-#define IODINE_IS_PLUGIN_UI(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IODINE_TYPE_PLUGIN_UI))
-#define IODINE_IS_PLUGIN_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IODINE_TYPE_PLUGIN_UI))
-#define IODINE_PLUGIN_UI_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), IODINE_TYPE_PLUGIN_UI, 
IodinePluginUiClass))
+#define IODINE_TYPE_EDITOR_PLUGIN            (iodine_editor_plugin_get_type ())
+#define IODINE_EDITOR_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), IODINE_TYPE_EDITOR_PLUGIN, 
IodineEditorPlugin))
+#define IODINE_EDITOR_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), IODINE_TYPE_EDITOR_PLUGIN, 
IodineEditorPluginClass))
+#define IODINE_IS_EDITOR_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IODINE_TYPE_EDITOR_PLUGIN))
+#define IODINE_IS_EDITOR_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IODINE_TYPE_EDITOR_PLUGIN))
+#define IODINE_EDITOR_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), IODINE_TYPE_EDITOR_PLUGIN, 
IodineEditorPluginClass))
 
-typedef struct _IodinePluginUi IodinePluginUi;
-typedef struct _IodinePluginUiClass IodinePluginUiClass;
+typedef struct _IodineEditorPlugin IodineEditorPlugin;
+typedef struct _IodineEditorPluginClass IodineEditorPluginClass;
 
-struct _IodinePluginUi {
+struct _IodineEditorPlugin {
        GObject parent;
 };
 
-struct _IodinePluginUiClass {
+struct _IodineEditorPluginClass {
        GObjectClass parent;
 };
 
-GType iodine_plugin_ui_get_type (void);
+GType iodine_editor_plugin_get_type (void);
 
 
-#define IODINE_TYPE_PLUGIN_UI_WIDGET            (iodine_plugin_ui_widget_get_type ())
-#define IODINE_PLUGIN_UI_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
IODINE_TYPE_PLUGIN_UI_WIDGET, IodinePluginUiWidget))
-#define IODINE_PLUGIN_UI_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
IODINE_TYPE_PLUGIN_UI_WIDGET, IodinePluginUiWidgetClass))
-#define IODINE_IS_PLUGIN_UI_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
IODINE_TYPE_PLUGIN_UI_WIDGET))
-#define IODINE_IS_PLUGIN_UI_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
IODINE_TYPE_PLUGIN_UI_WIDGET))
-#define IODINE_PLUGIN_UI_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
IODINE_TYPE_PLUGIN_UI_WIDGET, IodinePluginUiWidgetClass))
+#define IODINE_TYPE_EDITOR            (iodine_editor_get_type ())
+#define IODINE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), IODINE_TYPE_EDITOR, IodineEditor))
+#define IODINE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), IODINE_TYPE_EDITOR, 
IodineEditorClass))
+#define IODINE_IS_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IODINE_TYPE_EDITOR))
+#define IODINE_IS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IODINE_TYPE_EDITOR))
+#define IODINE_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), IODINE_TYPE_EDITOR, 
IodineEditorClass))
 
-typedef struct _IodinePluginUiWidget IodinePluginUiWidget;
-typedef struct _IodinePluginUiWidgetClass IodinePluginUiWidgetClass;
+typedef struct _IodineEditor IodineEditor;
+typedef struct _IodineEditorClass IodineEditorClass;
 
-struct _IodinePluginUiWidget {
+struct _IodineEditor {
        GObject parent;
 };
 
-struct _IodinePluginUiWidgetClass {
+struct _IodineEditorClass {
        GObjectClass parent;
 };
 
-GType iodine_plugin_ui_widget_get_type (void);
+GType iodine_editor_get_type (void);
 
 #endif /* _NM_IODINE_H_ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]