[krb5-auth-dialog] applet: Make object creation more idiomatic



commit 6bc6ed299114444ac428836278b34b949268bbbb
Author: Guido Günther <agx sigxcpu org>
Date:   Thu Oct 13 14:05:56 2022 +0200

    applet: Make object creation more idiomatic
    
    Just fully initialize the object on creation. We can drop
    the asserts as those functions either can't fail or warn
    on their own already.

 src/ka-applet-priv.h |  2 --
 src/ka-applet.c      | 39 +++++++++++++++------------------------
 2 files changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/src/ka-applet-priv.h b/src/ka-applet-priv.h
index 80b77f6..ed88456 100644
--- a/src/ka-applet-priv.h
+++ b/src/ka-applet-priv.h
@@ -65,8 +65,6 @@ GtkWindow* ka_applet_last_focused_window(KaApplet *self);
 #define KA_PROP_NAME_TGT_RENEWABLE   "tgt-renewable"
 #define KA_PROP_NAME_CONF_TICKETS    "conf-tickets"
 
-/* create the applet */
-KaApplet *ka_applet_create (void);
 /* destroy the applet */
 void ka_applet_destroy (KaApplet *self);
 
diff --git a/src/ka-applet.c b/src/ka-applet.c
index a1b9355..6a4b3a6 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -404,6 +404,18 @@ ka_applet_get_property (GObject *object,
     }
 }
 
+static void
+ka_applet_constructed (GObject *object)
+{
+    KaApplet *self = KA_APPLET (object);
+
+    G_OBJECT_CLASS (ka_applet_parent_class)->constructed (object);
+
+    self->pwdialog = ka_pwdialog_new ();
+    self->settings = ka_settings_init (self);
+    self->loader = ka_plugin_loader_create (self);
+    ka_dbus_connect (self);
+}
 
 static void
 ka_applet_dispose (GObject *object)
@@ -442,6 +454,7 @@ ka_applet_finalize (GObject *object)
 static void
 ka_applet_init (KaApplet *applet)
 {
+    gtk_window_set_default_icon_name ("krb-valid-ticket");
 }
 
 static void
@@ -450,6 +463,7 @@ ka_applet_class_init (KaAppletClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     int i;
 
+    object_class->constructed = ka_applet_constructed;;
     object_class->dispose = ka_applet_dispose;
     object_class->finalize = ka_applet_finalize;
 
@@ -779,27 +793,6 @@ ka_applet_destroy (KaApplet* self)
 }
 
 
-KaApplet *
-ka_applet_create (void)
-{
-    KaApplet *self = ka_applet_new ();
-
-    gtk_window_set_default_icon_name ("krb-valid-ticket");
-
-    self->pwdialog = ka_pwdialog_new ();
-    g_return_val_if_fail (self->pwdialog != NULL, NULL);
-
-    self->settings = ka_settings_init (self);
-    g_return_val_if_fail (self->settings != NULL, NULL);
-
-    self->loader = ka_plugin_loader_create (self);
-    g_return_val_if_fail (self->loader != NULL, NULL);
-
-    g_return_val_if_fail (ka_dbus_connect (self), NULL);
-
-    return self;
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -813,9 +806,7 @@ main (int argc, char *argv[])
     g_set_application_name (KA_NAME);
 
     gtk_init (&argc, &argv);
-    applet = ka_applet_create ();
-    if (!applet)
-        return 1;
+    applet = ka_applet_new ();
 
     setup_signal_handlers(applet);
     return g_application_run (G_APPLICATION(applet), argc, argv);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]