[krb5-auth-dialog] main-window: Derive from GtkApplicationWindow
- From: Guido Günther <guidog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [krb5-auth-dialog] main-window: Derive from GtkApplicationWindow
- Date: Fri, 21 Oct 2022 08:55:39 +0000 (UTC)
commit f921d9d443a8a031725806e891692d40b4b1e26a
Author: Guido Günther <agx sigxcpu org>
Date: Thu Oct 20 17:00:22 2022 +0200
main-window: Derive from GtkApplicationWindow
Instead of custom create functions and static variables make it a proper
object. This is just the basic code move, other cleanups avoided
as good as possible.
src/ka-applet.c | 15 ++--
src/ka-main-window.c | 174 ++++++++++++++++++++++---------------
src/ka-main-window.h | 12 ++-
src/resources/ui/ka-main-window.ui | 6 +-
4 files changed, 126 insertions(+), 81 deletions(-)
---
diff --git a/src/ka-applet.c b/src/ka-applet.c
index e7d5347..e2054e9 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -71,6 +71,7 @@ struct _KaApplet {
KaPwDialog *pwdialog; /* the password dialog */
KaPreferences *prefs; /* the prefs dialog */
+ KaMainWindow *main_window; /* The main application window */
int pw_prompt_secs; /* when to start sending notifications */
KaPluginLoader *loader; /* Plugin loader */
@@ -110,14 +111,18 @@ ka_applet_signal_emit (KaApplet *this, guint signum, krb5_timestamp expiry)
g_signal_emit (this, signals[signum], 0, princ, (guint32) expiry);
}
+
static void
-ka_applet_activate (GApplication *application G_GNUC_UNUSED)
+ka_applet_activate (GApplication *application)
{
KaApplet *self = KA_APPLET(application);
if (is_initialized) {
+ gboolean show_conf_tickets;
+
KA_DEBUG ("Main window activated");
- ka_main_window_show (self);
+ g_object_get(self, KA_PROP_NAME_CONF_TICKETS, &show_conf_tickets, NULL);
+ ka_main_window_show (self->main_window, show_conf_tickets);
} else
is_initialized = TRUE;
}
@@ -283,16 +288,14 @@ static void
ka_applet_startup (GApplication *application)
{
KaApplet *self = KA_APPLET (application);
- GtkWindow *main_window;
KA_DEBUG ("Primary application");
G_APPLICATION_CLASS (ka_applet_parent_class)->startup (application);
self->startup_ccache = ka_kerberos_init (self);
- main_window = GTK_WINDOW(ka_main_window_create (self));
- gtk_window_set_transient_for(GTK_WINDOW(self->pwdialog),
- main_window);
+ self->main_window = ka_main_window_new (self);
+ gtk_window_set_transient_for(GTK_WINDOW(self->pwdialog), GTK_WINDOW (self->main_window));
self->prefs = ka_preferences_new (self);
diff --git a/src/ka-main-window.c b/src/ka-main-window.c
index db490c0..2df9fa9 100644
--- a/src/ka-main-window.c
+++ b/src/ka-main-window.c
@@ -2,7 +2,7 @@
*
* Krb5 Auth Applet -- Acquire and release Kerberos tickets
*
- * (C) 2009,2011,2013 Guido Guenther <agx sigxcpu org>
+ * (C) 2009,2011,2013,2022 Guido Guenther <agx sigxcpu org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -29,19 +29,26 @@
#include "ka-tools.h"
#include "ka-preferences.h"
-static GtkListStore *tickets;
-static GtkButton *ticket_btn;
-static GtkApplicationWindow *main_window;
+
+struct _KaMainWindow {
+ GtkApplicationWindow parent;
+
+ GtkStack *stack;
+ GtkListStore *tickets;
+ GtkButton *get_ticket_btn;
+ GtkTreeView *tickets_view;
+};
+
+G_DEFINE_TYPE (KaMainWindow, ka_main_window, GTK_TYPE_APPLICATION_WINDOW)
static void
-ccache_changed_cb (KaApplet* applet,
- gpointer user_data G_GNUC_UNUSED)
+ccache_changed_cb (KaApplet* applet, KaMainWindow *self)
{
gboolean conf_tickets;
KA_DEBUG("Refreshing ticket list");
g_object_get(applet, KA_PROP_NAME_CONF_TICKETS, &conf_tickets, NULL);
- ka_get_service_tickets (tickets, !conf_tickets);
+ ka_get_service_tickets (self->tickets, !conf_tickets);
}
@@ -49,16 +56,24 @@ static void
enable_ticket_button_cb (gpointer* applet G_GNUC_UNUSED,
gchar *princ G_GNUC_UNUSED,
guint when G_GNUC_UNUSED,
- gpointer user_data)
+ KaMainWindow *self)
+{
+ gtk_widget_set_sensitive(GTK_WIDGET(self->get_ticket_btn), TRUE);
+}
+
+
+static void
+disable_ticket_button_cb (gpointer* applet G_GNUC_UNUSED,
+ gchar *princ G_GNUC_UNUSED,
+ guint when G_GNUC_UNUSED,
+ KaMainWindow *self)
{
- gboolean enable = GPOINTER_TO_UINT(user_data);
- KA_DEBUG ("Sensitive: %u", enable);
- gtk_widget_set_sensitive(GTK_WIDGET(ticket_btn), enable);
+ gtk_widget_set_sensitive(GTK_WIDGET(self->get_ticket_btn), FALSE);
}
static void
-ticket_btn_clicked(GtkButton* btn G_GNUC_UNUSED, gpointer user_data)
+get_ticket_btn_clicked(GtkButton* btn G_GNUC_UNUSED, gpointer user_data)
{
KaApplet *applet = KA_APPLET(user_data);
ka_grab_credentials (applet);
@@ -87,32 +102,63 @@ on_row_deleted(GtkTreeModel *model,
}
-GtkApplicationWindow *
-ka_main_window_create (KaApplet *applet)
+static void
+ka_main_window_constructed (GObject *object)
+{
+ KaMainWindow *self = KA_MAIN_WINDOW(object);
+ KaApplet *applet = KA_APPLET (g_application_get_default ());
+
+ G_OBJECT_CLASS (ka_main_window_parent_class)->constructed (object);
+
+ g_signal_connect (applet, "krb-ccache-changed",
+ G_CALLBACK(ccache_changed_cb),
+ self);
+
+ g_signal_connect (applet, "krb-tgt-acquired",
+ G_CALLBACK (disable_ticket_button_cb),
+ self);
+
+ g_signal_connect (applet, "krb-tgt-expired",
+ G_CALLBACK (enable_ticket_button_cb),
+ self);
+
+ g_signal_connect(self->get_ticket_btn, "clicked", G_CALLBACK(get_ticket_btn_clicked), applet);
+}
+
+
+static void
+ka_main_window_class_init (KaMainWindowClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ object_class->constructed = ka_main_window_constructed;
+
+ gtk_widget_class_set_template_from_resource (widget_class,
+ "/org/gnome/krb5-auth-dialog/ui/ka-main-window.ui");
+ gtk_widget_class_bind_template_child (widget_class, KaMainWindow, stack);
+ gtk_widget_class_bind_template_child (widget_class, KaMainWindow, get_ticket_btn);
+ gtk_widget_class_bind_template_child (widget_class, KaMainWindow, tickets_view);
+}
+
+
+static void
+ka_main_window_init (KaMainWindow *self)
{
GtkCellRenderer *text_renderer, *toggle_renderer;
GtkTreeViewColumn *column;
- GtkTreeView *tickets_view;
- GtkStack *stack;
- GtkBuilder *builder;
-
- tickets = gtk_list_store_new (N_COLUMNS,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
-
- builder = gtk_builder_new_from_resource ("/org/gnome/krb5-auth-dialog/ui/ka-main-window.ui");
- main_window =
- GTK_APPLICATION_WINDOW (gtk_builder_get_object (builder,
- "krb5_main_window"));
- g_object_set(main_window, "application", applet, NULL);
-
- tickets_view =
- GTK_TREE_VIEW (gtk_builder_get_object (builder, "krb5_tickets_treeview"));
- gtk_tree_view_set_model (GTK_TREE_VIEW (tickets_view),
- GTK_TREE_MODEL (tickets));
+
+ gtk_widget_init_template (GTK_WIDGET (self));
+
+ self->tickets = gtk_list_store_new (N_COLUMNS,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (self->tickets_view),
+ GTK_TREE_MODEL (self->tickets));
text_renderer = gtk_cell_renderer_text_new ();
g_object_set (text_renderer,
@@ -120,39 +166,39 @@ ka_main_window_create (KaApplet *applet)
NULL);
toggle_renderer = gtk_cell_renderer_toggle_new ();
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(self->tickets_view), -1,
_("Principal"),
text_renderer,
"text",
PRINCIPAL_COLUMN,
NULL);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(self->tickets_view), -1,
_("Start"),
text_renderer,
"text",
START_TIME_COLUMN,
NULL);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(self->tickets_view), -1,
_("End"),
text_renderer,
"markup",
END_TIME_COLUMN,
NULL);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(self->tickets_view), -1,
/* Translators: this is an abbreviation for forwardable */
_("Fwd"),
toggle_renderer,
"active",
FORWARDABLE_COLUMN,
NULL);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(self->tickets_view), -1,
/* Translators: this is an abbreviation for proxiable */
_("Proxy"),
toggle_renderer,
"active",
PROXIABLE_COLUMN,
NULL);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(self->tickets_view), -1,
/* Translators: this is an abbreviation for renewable */
_("Renew"),
toggle_renderer,
@@ -161,46 +207,34 @@ ka_main_window_create (KaApplet *applet)
NULL);
for (int i = PRINCIPAL_COLUMN; i <= END_TIME_COLUMN; i++) {
- column = gtk_tree_view_get_column(tickets_view, i);
+ column = gtk_tree_view_get_column(self->tickets_view, i);
g_object_set (column, "expand", TRUE, NULL);
}
- stack = GTK_STACK (gtk_builder_get_object (builder, "stack"));
- g_signal_connect(tickets, "row-inserted",
+ g_signal_connect(self->tickets, "row-inserted",
G_CALLBACK(on_row_inserted),
- stack);
- g_signal_connect(tickets, "row-deleted",
+ self->stack);
+ g_signal_connect(self->tickets, "row-deleted",
G_CALLBACK(on_row_deleted),
- stack);
- on_row_deleted(GTK_TREE_MODEL(tickets), NULL, stack);
-
- g_signal_connect (applet, "krb-ccache-changed",
- G_CALLBACK(ccache_changed_cb),
- NULL);
-
- ticket_btn =
- GTK_BUTTON (gtk_builder_get_object (builder, "get_ticket_btn"));
- g_signal_connect(ticket_btn, "clicked", G_CALLBACK(ticket_btn_clicked), applet);
+ self->stack);
+ on_row_deleted(GTK_TREE_MODEL(self->tickets), NULL, self->stack);
+}
- g_signal_connect (applet, "krb-tgt-acquired",
- G_CALLBACK (enable_ticket_button_cb),
- GUINT_TO_POINTER(FALSE));
- g_signal_connect (applet, "krb-tgt-expired",
- G_CALLBACK (enable_ticket_button_cb),
- GUINT_TO_POINTER(TRUE));
- g_object_unref (builder);
- return main_window;
+KaMainWindow *
+ka_main_window_new (KaApplet *ka_applet)
+{
+ return KA_MAIN_WINDOW (g_object_new (KA_TYPE_MAIN_WINDOW,
+ "application", ka_applet,
+ NULL));
}
+
void
-ka_main_window_show (KaApplet *applet)
+ka_main_window_show (KaMainWindow *self, gboolean show_conf_tickets)
{
- gboolean conf_tickets;
-
- g_object_get(applet, KA_PROP_NAME_CONF_TICKETS, &conf_tickets, NULL);
- if (ka_get_service_tickets (tickets, !conf_tickets)) {
- gtk_window_present (GTK_WINDOW(main_window));
+ if (ka_get_service_tickets (self->tickets, !show_conf_tickets)) {
+ gtk_window_present (GTK_WINDOW(self));
} else {
GtkWidget *message_dialog;
diff --git a/src/ka-main-window.h b/src/ka-main-window.h
index a3ceb28..b754d3e 100644
--- a/src/ka-main-window.h
+++ b/src/ka-main-window.h
@@ -20,8 +20,12 @@
#ifndef KA_TICKETS_H
#define KA_TICKETS_H
+#include <glib-object.h>
+
#include "ka-applet.h"
+G_BEGIN_DECLS
+
enum ticket_columns {
PRINCIPAL_COLUMN,
START_TIME_COLUMN,
@@ -32,8 +36,12 @@ enum ticket_columns {
N_COLUMNS
};
+#define KA_TYPE_MAIN_WINDOW (ka_main_window_get_type ())
+G_DECLARE_FINAL_TYPE (KaMainWindow, ka_main_window, KA, MAIN_WINDOW, GtkApplicationWindow)
+
+KaMainWindow *ka_main_window_new (KaApplet *self);
+void ka_main_window_show (KaMainWindow *self, gboolean show_conf_tickets);
-GtkApplicationWindow *ka_main_window_create (KaApplet *applet);
-void ka_main_window_show (KaApplet *applet);
+G_END_DECLS
#endif
diff --git a/src/resources/ui/ka-main-window.ui b/src/resources/ui/ka-main-window.ui
index 2745592..8b295af 100644
--- a/src/resources/ui/ka-main-window.ui
+++ b/src/resources/ui/ka-main-window.ui
@@ -23,7 +23,7 @@
</section>
</menu>
- <object class="GtkApplicationWindow" id="krb5_main_window">
+ <template class="KaMainWindow" parent="GtkApplicationWindow">
<property name="title" translatable="yes">Service Tickets</property>
<property name="default-width">700</property>
<property name="hide-on-close">True</property>
@@ -38,7 +38,7 @@
<object class="GtkStackPage">
<property name="name">tickets</property>
<property name="child">
- <object class="GtkTreeView" id="krb5_tickets_treeview">
+ <object class="GtkTreeView" id="tickets_view">
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection"/>
</child>
@@ -78,5 +78,5 @@
</child>
</object>
</child>
- </object>
+ </template>>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
