diff options
author | Guido Günther <agx@sigxcpu.org> | 2014-10-27 20:14:06 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2014-10-27 20:14:06 +0100 |
commit | c39fada698da5b17680af8d9e6958b07bfbdbdd3 (patch) | |
tree | e9e2eae6977769d87736dd9c5a197c7b7e14a266 /src/ka-main-window.c | |
parent | Document changes and release 3.12.0-2 (diff) | |
parent | New upstream version 3.15.1 (diff) | |
download | krb5-auth-dialog-c39fada698da5b17680af8d9e6958b07bfbdbdd3.tar.gz krb5-auth-dialog-c39fada698da5b17680af8d9e6958b07bfbdbdd3.tar.bz2 krb5-auth-dialog-c39fada698da5b17680af8d9e6958b07bfbdbdd3.zip |
Merge tag 'upstream/3.15.1' into experimental
Upstream version 3.15.1
# gpg: Signature made Mo 27 Okt 2014 20:14:03 CET
# gpg: using RSA key 0x07B8B7B0EA98120B
# gpg: please do a --check-trustdb
# gpg: Good signature from "Guido Günther <agx@sigxcpu.org>"
# gpg: aka "Guido Günther <gg@godiug.net>"
# gpg: aka "Guido Günther <agx@debian.org>"
Diffstat (limited to 'src/ka-main-window.c')
-rw-r--r-- | src/ka-main-window.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ka-main-window.c b/src/ka-main-window.c index 84848ef..0a1a548 100644 --- a/src/ka-main-window.c +++ b/src/ka-main-window.c @@ -45,10 +45,11 @@ ccache_changed_cb (KaApplet* applet, GtkApplicationWindow * -ka_main_window_create (KaApplet *applet, GtkBuilder *xml) +ka_main_window_create (KaApplet *applet) { GtkCellRenderer *text_renderer, *toggle_renderer; GtkTreeView *tickets_view; + GtkBuilder *builder; tickets = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, @@ -57,13 +58,15 @@ ka_main_window_create (KaApplet *applet, GtkBuilder *xml) 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 (xml, + GTK_APPLICATION_WINDOW (gtk_builder_get_object (builder, "krb5_main_window")); + gtk_builder_connect_signals (builder, NULL); g_object_set(main_window, "application", applet, NULL); tickets_view = - GTK_TREE_VIEW (gtk_builder_get_object (xml, "krb5_tickets_treeview")); + 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)); @@ -114,6 +117,7 @@ ka_main_window_create (KaApplet *applet, GtkBuilder *xml) G_CALLBACK(ccache_changed_cb), NULL); + g_object_unref (builder); return main_window; } |