[network-manager-applet] libnm-gtk: couple fixes and cleanups of NMAWirelessDialog
- From: JiÅÃ KlimeÅ <jklimes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] libnm-gtk: couple fixes and cleanups of NMAWirelessDialog
- Date: Fri, 20 Jul 2012 12:32:00 +0000 (UTC)
commit c2ca113de103cea6bbc2935d83d116c64ed917f9
Author: JiÅÃ KlimeÅ <jklimes redhat com>
Date: Fri Jul 20 14:27:43 2012 +0200
libnm-gtk: couple fixes and cleanups of NMAWirelessDialog
src/libnm-gtk/nm-wireless-dialog.c | 22 +++++++++++-----------
src/libnm-gtk/nm-wireless-dialog.h | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/libnm-gtk/nm-wireless-dialog.c b/src/libnm-gtk/nm-wireless-dialog.c
index 27dc951..f17c776 100644
--- a/src/libnm-gtk/nm-wireless-dialog.c
+++ b/src/libnm-gtk/nm-wireless-dialog.c
@@ -17,7 +17,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * (C) Copyright 2007 - 2010 Red Hat, Inc.
+ * (C) Copyright 2007 - 2012 Red Hat, Inc.
*/
#ifdef HAVE_CONFIG_H
@@ -1269,13 +1269,13 @@ nma_wireless_dialog_get_connection (NMAWirelessDialog *self,
GtkWidget *
nma_wireless_dialog_new (NMClient *client,
- NMRemoteSettings *settings,
+ NMRemoteSettings *settings,
NMConnection *connection,
NMDevice *device,
NMAccessPoint *ap,
gboolean secrets_only)
{
- GObject *obj;
+ NMAWirelessDialog *self;
NMAWirelessDialogPrivate *priv;
guint32 dev_caps;
@@ -1290,9 +1290,9 @@ nma_wireless_dialog_new (NMClient *client,
g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL);
}
- obj = g_object_new (NMA_TYPE_WIRELESS_DIALOG, NULL);
- if (obj) {
- priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (obj);
+ self = NMA_WIRELESS_DIALOG (g_object_new (NMA_TYPE_WIRELESS_DIALOG, NULL));
+ if (self) {
+ priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
priv->client = g_object_ref (client);
priv->settings = g_object_ref (settings);
@@ -1302,14 +1302,14 @@ nma_wireless_dialog_new (NMClient *client,
priv->sec_combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_combo"));
priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- if (!internal_init (NMA_WIRELESS_DIALOG (obj), connection, device, secrets_only, FALSE)) {
+ if (!internal_init (self, connection, device, secrets_only, FALSE)) {
g_warning ("Couldn't create wireless security dialog.");
- gtk_widget_destroy (GTK_WIDGET (obj));
- obj = NULL;
+ gtk_widget_destroy (GTK_WIDGET (self));
+ self = NULL;
}
}
- return (GtkWidget *) obj;
+ return GTK_WIDGET (self);
}
static GtkWidget *
@@ -1443,7 +1443,7 @@ nma_wireless_dialog_class_init (NMAWirelessDialogClass *nmad_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (nmad_class);
- g_type_class_add_private (object_class, sizeof (NMAWirelessDialogPrivate));
+ g_type_class_add_private (nmad_class, sizeof (NMAWirelessDialogPrivate));
/* virtual methods */
object_class->dispose = dispose;
diff --git a/src/libnm-gtk/nm-wireless-dialog.h b/src/libnm-gtk/nm-wireless-dialog.h
index bee8711..446d467 100644
--- a/src/libnm-gtk/nm-wireless-dialog.h
+++ b/src/libnm-gtk/nm-wireless-dialog.h
@@ -16,7 +16,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * (C) Copyright 2007 - 2011 Red Hat, Inc.
+ * (C) Copyright 2007 - 2012 Red Hat, Inc.
*/
@@ -40,7 +40,7 @@
#define NMA_WIRELESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMA_TYPE_WIRELESS_DIALOG, NMAWirelessDialog))
#define NMA_WIRELESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMA_TYPE_WIRELESS_DIALOG, NMAWirelessDialogClass))
#define NMA_IS_WIRELESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMA_TYPE_WIRELESS_DIALOG))
-#define NMA_IS_WIRELESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMA_TYPE_WIRELESS_DIALOG))
+#define NMA_IS_WIRELESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMA_TYPE_WIRELESS_DIALOG))
#define NMA_WIRELESS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMA_TYPE_WIRELESS_DIALOG, NMAWirelessDialogClass))
typedef struct {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]