Hello community,
here is the log from the commit of package krb5-auth-dialog for openSUSE:Factory checked in at 2013-03-30 14:58:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/krb5-auth-dialog (Old)
and /work/SRC/openSUSE:Factory/.krb5-auth-dialog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krb5-auth-dialog", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/krb5-auth-dialog/krb5-auth-dialog.changes 2013-03-21 22:04:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.krb5-auth-dialog.new/krb5-auth-dialog.changes 2013-03-30 14:58:06.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Mar 28 15:14:49 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 3.8.0:
+ + Use an app menu instead of a menu bar.
+
+-------------------------------------------------------------------
Old:
----
krb5-auth-dialog-3.7.92.tar.xz
New:
----
krb5-auth-dialog-3.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ krb5-auth-dialog.spec ++++++
--- /var/tmp/diff_new_pack.6NKFqJ/_old 2013-03-30 14:58:07.000000000 +0100
+++ /var/tmp/diff_new_pack.6NKFqJ/_new 2013-03-30 14:58:07.000000000 +0100
@@ -21,10 +21,10 @@
Summary: Kerberos 5 ticket monitoring tray applet
License: GPL-2.0+
Group: Productivity/Security
-Version: 3.7.92
+Version: 3.8.0
Release: 0
Url: http://download.gnome.org/sources/krb5-auth-dialog/
-Source: http://download.gnome.org/sources/krb5-auth-dialog/3.7/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/krb5-auth-dialog/3.8/%{name}-%{version}.tar.xz
BuildRequires: bison
BuildRequires: flex
BuildRequires: gnome-doc-utils-devel
++++++ krb5-auth-dialog-3.7.92.tar.xz -> krb5-auth-dialog-3.8.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/ChangeLog new/krb5-auth-dialog-3.8.0/ChangeLog
--- old/krb5-auth-dialog-3.7.92/ChangeLog 2013-03-17 16:01:00.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/ChangeLog 2013-03-27 21:42:32.000000000 +0100
@@ -1,5 +1,52 @@
# Generated by Makefile. Do not edit.
+commit 3e9dc1284c6b0f59468457c7c6c786dc3fe66407
+Author: Guido Günther
+Date: Wed Mar 27 21:41:11 2013 +0100
+
+ Use a 3 digit version number
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7f8e4f1f2aa305e76eac5faa02f85cd258fffdfb
+Author: Guido Günther
+Date: Wed Mar 27 21:32:35 2013 +0100
+
+ Release 3.8
+
+ NEWS | 5 +++++
+ configure.ac | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+commit 80da3657d00d37404dcddb9530584516d0efe7eb
+Author: Guido Günther
+Date: Mon Mar 25 07:29:05 2013 +0100
+
+ Switch to an app_menu
+
+ Use GtkApplicationWindow to make this simple.
+
+ src/ka-applet-priv.h | 1 +
+ src/ka-applet.c | 120 ++++++++++++++++++++++++++++++++++++++++-------
+ src/ka-main-window.c | 66 ++++----------------------
+ src/ka-main-window.h | 2 +-
+ src/ka-preferences.c | 9 ++--
+ src/ka-preferences.h | 2 +-
+ src/ka-tools.c | 6 ++-
+ src/ka-tools.h | 3 +-
+ src/krb5-auth-dialog.ui | 115 ++++++++++-----------------------------------
+ 9 files changed, 151 insertions(+), 173 deletions(-)
+
+commit f238a8e7bc89c22ce9d39e4be737579062afb425
+Author: Guido Günther
+Date: Sun Mar 24 18:31:43 2013 +0100
+
+ Update for GTK+3
+
+ src/krb5-auth-dialog.ui | 20 ++------------------
+ 1 file changed, 2 insertions(+), 18 deletions(-)
+
commit 00ea8cd15602842f28dcad84ffaee4b952a8a1a5
Author: Guido Günther
Date: Sun Mar 17 15:57:34 2013 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/NEWS new/krb5-auth-dialog-3.8.0/NEWS
--- old/krb5-auth-dialog-3.7.92/NEWS 2013-03-17 16:00:14.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/NEWS 2013-03-27 21:32:32.000000000 +0100
@@ -1,3 +1,8 @@
+===========
+Version 3.8
+===========
+* Use an app menu instead of a menu bar
+
==============
Version 3.7.92
==============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/configure new/krb5-auth-dialog-3.8.0/configure
--- old/krb5-auth-dialog-3.7.92/configure 2013-03-17 15:57:59.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/configure 2013-03-27 21:41:33.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for krb5-auth-dialog 3.7.92.
+# Generated by GNU Autoconf 2.69 for krb5-auth-dialog 3.8.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='krb5-auth-dialog'
PACKAGE_TARNAME='krb5-auth-dialog'
-PACKAGE_VERSION='3.7.92'
-PACKAGE_STRING='krb5-auth-dialog 3.7.92'
+PACKAGE_VERSION='3.8.0'
+PACKAGE_STRING='krb5-auth-dialog 3.8.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1437,7 +1437,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures krb5-auth-dialog 3.7.92 to adapt to many kinds of systems.
+\`configure' configures krb5-auth-dialog 3.8.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1508,7 +1508,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of krb5-auth-dialog 3.7.92:";;
+ short | recursive ) echo "Configuration of krb5-auth-dialog 3.8.0:";;
esac
cat <<\_ACEOF
@@ -1660,7 +1660,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-krb5-auth-dialog configure 3.7.92
+krb5-auth-dialog configure 3.8.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2082,7 +2082,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by krb5-auth-dialog $as_me 3.7.92, which was
+It was created by krb5-auth-dialog $as_me 3.8.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2898,7 +2898,7 @@
# Define the identity of the package.
PACKAGE='krb5-auth-dialog'
- VERSION='3.7.92'
+ VERSION='3.8.0'
cat >>confdefs.h <<_ACEOF
@@ -16470,7 +16470,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by krb5-auth-dialog $as_me 3.7.92, which was
+This file was extended by krb5-auth-dialog $as_me 3.8.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16536,7 +16536,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-krb5-auth-dialog config.status 3.7.92
+krb5-auth-dialog config.status 3.8.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/configure.ac new/krb5-auth-dialog-3.8.0/configure.ac
--- old/krb5-auth-dialog-3.7.92/configure.ac 2013-03-17 15:57:41.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/configure.ac 2013-03-27 21:41:05.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([krb5-auth-dialog],[3.7.92])
+AC_INIT([krb5-auth-dialog],[3.8.0])
AC_CONFIG_SRCDIR(src/ka-kerberos.c)
dnl Make automake keep quiet about wildcards & other GNUmake-isms
AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wno-portability])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/krb5-auth-dialog.spec new/krb5-auth-dialog-3.8.0/krb5-auth-dialog.spec
--- old/krb5-auth-dialog-3.7.92/krb5-auth-dialog.spec 2013-03-17 16:00:56.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/krb5-auth-dialog.spec 2013-03-27 21:42:10.000000000 +0100
@@ -1,6 +1,6 @@
Summary: Kerberos 5 authentication dialog
Name: krb5-auth-dialog
-Version: 3.7.92
+Version: 3.8.0
Release: 1
License: GPL
Group: User Interface/X
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/ka-applet-priv.h new/krb5-auth-dialog-3.8.0/src/ka-applet-priv.h
--- old/krb5-auth-dialog-3.7.92/src/ka-applet-priv.h 2013-03-16 17:10:21.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/src/ka-applet-priv.h 2013-03-25 12:03:00.000000000 +0100
@@ -55,6 +55,7 @@
void ka_applet_signal_emit (KaApplet *self, KaAppletSignalNumber signum,
krb5_timestamp expiry);
void ka_applet_set_msg (KaApplet *self, const char *msg);
+GtkWindow* ka_applet_last_focused_window(KaApplet *self);
/* properties */
#define KA_PROP_NAME_PRINCIPAL "principal"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/ka-applet.c new/krb5-auth-dialog-3.8.0/src/ka-applet.c
--- old/krb5-auth-dialog-3.7.92/src/ka-applet.c 2013-03-16 17:10:21.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/src/ka-applet.c 2013-03-25 12:03:00.000000000 +0100
@@ -182,20 +182,102 @@
return FALSE;
}
+GtkWindow *ka_applet_last_focused_window (KaApplet *self)
+{
+ GList *l = gtk_application_get_windows (GTK_APPLICATION(self));
+
+ if (l != NULL )
+ return g_list_first (l)->data;
+
+ return NULL;
+}
+
+static void
+action_preferences (GSimpleAction *action G_GNUC_UNUSED,
+ GVariant *parameter G_GNUC_UNUSED,
+ gpointer userdata)
+{
+ KaApplet *self = userdata;
+
+ ka_preferences_window_show (self);
+}
+
+static void
+action_about (GSimpleAction *action G_GNUC_UNUSED,
+ GVariant *parameter G_GNUC_UNUSED,
+ gpointer userdata)
+{
+ KaApplet *self = KA_APPLET(userdata);
+
+ ka_show_about (self);
+}
+
+static void
+action_help (GSimpleAction *action G_GNUC_UNUSED,
+ GVariant *parameter G_GNUC_UNUSED,
+ gpointer userdata)
+{
+ KaApplet *self = KA_APPLET(userdata);
+ GtkWindow *window = ka_applet_last_focused_window (self);
+
+ ka_show_help (gtk_window_get_screen (window), NULL, NULL);
+}
+
+static void
+action_quit (GSimpleAction *action G_GNUC_UNUSED,
+ GVariant *parameter G_GNUC_UNUSED,
+ gpointer userdata)
+{
+ KaApplet *self = KA_APPLET (userdata);
+
+ ka_applet_destroy (self);
+}
+
+static GActionEntry app_entries[] = {
+ { "preferences", action_preferences, NULL, NULL, NULL, {0} },
+ { "about", action_about, NULL, NULL, NULL, {0} },
+ { "help", action_help, NULL, NULL, NULL, {0} },
+ { "quit", action_quit, NULL, NULL, NULL, {0} },
+};
+
+static void
+ka_applet_app_menu_create(KaApplet *self,
+ GtkBuilder *uixml)
+{
+ const gchar *debug_no_app_menu;
+ GMenuModel *model = G_MENU_MODEL(gtk_builder_get_object (uixml,
+ "app-menu"));
+ g_action_map_add_action_entries (G_ACTION_MAP (self),
+ app_entries, G_N_ELEMENTS (app_entries),
+ self);
+
+ g_assert (model != NULL);
+ gtk_application_set_app_menu (GTK_APPLICATION(self),
+ model);
+
+ debug_no_app_menu = g_getenv ("KRB5_AUTH_DIALOG_DEBUG_NO_APP_MENU");
+ if (debug_no_app_menu) {
+ KA_DEBUG ("Disabling app menu GtkSetting as requested...");
+ g_object_set (gtk_settings_get_default (),
+ "gtk-shell-shows-app-menu", FALSE,
+ NULL);
+ }
+}
+
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->priv->startup_ccache = ka_kerberos_init (self);
- main_window = ka_main_window_create (self, self->priv->uixml);
- gtk_application_add_window (GTK_APPLICATION(self), main_window);
+ ka_main_window_create (self, self->priv->uixml);
ka_preferences_window_create (self, self->priv->uixml);
- G_APPLICATION_CLASS (ka_applet_parent_class)->startup (application);
+ ka_applet_app_menu_create(self, self->priv->uixml);
}
static void
@@ -821,7 +903,7 @@
static void
-ka_applet_menu_add_separator_item (GtkWidget *menu)
+ka_applet_tray_icon_menu_add_separator_item (GtkWidget *menu)
{
GtkWidget *menu_item;
@@ -833,7 +915,8 @@
/* Free all resources and quit */
static void
-ka_applet_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data)
+ka_applet_tray_icon_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+ gpointer user_data)
{
KaApplet *applet = KA_APPLET (user_data);
@@ -842,8 +925,8 @@
static void
-ka_applet_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
- gpointer user_data)
+ka_applet_tray_icon_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+ gpointer user_data)
{
KaApplet *applet = KA_APPLET (user_data);
@@ -853,8 +936,8 @@
static void
-ka_applet_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
- gpointer user_data)
+ka_applet_tray_icon_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+ gpointer user_data)
{
KaApplet *applet = KA_APPLET (user_data);
@@ -862,8 +945,8 @@
}
static void
-ka_applet_show_tickets_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
- gpointer user_data)
+ka_applet_tray_icon_show_tickets_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+ gpointer user_data)
{
ka_main_window_show (KA_APPLET(user_data));
}
@@ -883,31 +966,32 @@
menu_item =
gtk_image_menu_item_new_with_mnemonic (_("Remove Credentials _Cache"));
g_signal_connect (G_OBJECT (menu_item), "activate",
- G_CALLBACK (ka_applet_destroy_ccache_cb), applet);
+ G_CALLBACK (ka_applet_tray_icon_destroy_ccache_cb),
+ applet);
image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
- ka_applet_menu_add_separator_item (menu);
+ ka_applet_tray_icon_menu_add_separator_item (menu);
/* Ticket dialog */
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_List Tickets"));
g_signal_connect (G_OBJECT (menu_item), "activate",
- G_CALLBACK (ka_applet_show_tickets_cb), applet);
+ G_CALLBACK (ka_applet_tray_icon_show_tickets_cb), applet);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
/* Help item */
menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL);
g_signal_connect (G_OBJECT (menu_item), "activate",
- G_CALLBACK (ka_applet_show_help_cb), applet);
+ G_CALLBACK (ka_applet_tray_icon_show_help_cb), applet);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
- ka_applet_menu_add_separator_item (menu);
+ ka_applet_tray_icon_menu_add_separator_item (menu);
/* Quit */
menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL);
g_signal_connect (G_OBJECT (menu_item), "activate",
- G_CALLBACK (ka_applet_quit_cb), applet);
+ G_CALLBACK (ka_applet_tray_icon_quit_cb), applet);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_widget_show_all (menu);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/ka-main-window.c new/krb5-auth-dialog-3.8.0/src/ka-main-window.c
--- old/krb5-auth-dialog-3.7.92/src/ka-main-window.c 2013-03-16 17:10:21.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/src/ka-main-window.c 2013-03-25 12:03:00.000000000 +0100
@@ -31,7 +31,7 @@
#include "ka-preferences.h"
static GtkListStore *tickets;
-static GtkWindow *main_window;
+static GtkApplicationWindow *main_window;
static void
ccache_changed_cb (KaApplet* applet,
@@ -44,58 +44,8 @@
ka_get_service_tickets (tickets, !conf_tickets);
}
-static void
-menuitem_close_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
- gpointer user_data G_GNUC_UNUSED)
-{
- ka_main_window_hide();
-}
-
-static void
-menuitem_preferences_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
- gpointer user_data G_GNUC_UNUSED)
-{
- ka_preferences_window_show (main_window);
-}
-static void
-menuitem_about_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
- gpointer user_data G_GNUC_UNUSED)
-{
- ka_show_about ();
-}
-
-static void
-menuitem_help_contents_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
- gpointer user_data G_GNUC_UNUSED)
-{
- ka_show_help (gtk_window_get_screen (main_window), NULL, NULL);
-}
-
-
-static void
-ka_main_window_create_menu (KaApplet *applet, GtkBuilder *xml)
-{
- GtkMenuItem *item;
-
-#define CONNECT_MENU(name) \
- item = GTK_MENU_ITEM (gtk_builder_get_object (xml, \
- "menuitem_" #name)); \
- g_signal_connect (item, \
- "activate", \
- G_CALLBACK(menuitem_ ##name## _cb), \
- applet)
-
- CONNECT_MENU(close);
- CONNECT_MENU(preferences);
- CONNECT_MENU(about);
- CONNECT_MENU(help_contents);
-
-#undef CONNECT_MENU
-}
-
-
-GtkWindow *
+GtkApplicationWindow *
ka_main_window_create (KaApplet *applet, GtkBuilder *xml)
{
GtkCellRenderer *text_renderer, *toggle_renderer;
@@ -109,7 +59,10 @@
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
main_window =
- GTK_WINDOW (gtk_builder_get_object (xml, "krb5_main_window"));
+ GTK_APPLICATION_WINDOW (gtk_builder_get_object (xml,
+ "krb5_main_window"));
+ g_object_set(main_window, "application", applet, NULL);
+
tickets_view =
GTK_TREE_VIEW (gtk_builder_get_object (xml, "krb5_tickets_treeview"));
gtk_tree_view_set_model (GTK_TREE_VIEW (tickets_view),
@@ -162,7 +115,6 @@
G_CALLBACK(ccache_changed_cb),
NULL);
- ka_main_window_create_menu(applet, xml);
return main_window;
}
@@ -173,10 +125,10 @@
g_object_get(applet, KA_PROP_NAME_CONF_TICKETS, &conf_tickets, NULL);
if (ka_get_service_tickets (tickets, !conf_tickets)) {
- gtk_window_present (main_window);
+ gtk_window_present (GTK_WINDOW(main_window));
} else {
GtkWidget *message_dialog;
-
+
message_dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
@@ -184,7 +136,7 @@
_
("Error displaying service ticket information"));
gtk_window_set_resizable (GTK_WINDOW (message_dialog), FALSE);
-
+
g_signal_connect (message_dialog, "response",
G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (message_dialog);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/ka-main-window.h new/krb5-auth-dialog-3.8.0/src/ka-main-window.h
--- old/krb5-auth-dialog-3.7.92/src/ka-main-window.h 2013-03-16 17:10:21.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/src/ka-main-window.h 2013-03-25 12:03:00.000000000 +0100
@@ -34,7 +34,7 @@
};
-GtkWindow *ka_main_window_create (KaApplet *applet, GtkBuilder *xml);
+GtkApplicationWindow *ka_main_window_create (KaApplet *applet, GtkBuilder *xml);
void ka_main_window_show (KaApplet *applet);
void ka_main_window_hide (void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/ka-preferences.c new/krb5-auth-dialog-3.8.0/src/ka-preferences.c
--- old/krb5-auth-dialog-3.7.92/src/ka-preferences.c 2013-03-15 15:16:21.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/src/ka-preferences.c 2013-03-25 12:03:00.000000000 +0100
@@ -513,10 +513,13 @@
}
void
-ka_preferences_window_show (GtkWindow *main_window)
+ka_preferences_window_show (KaApplet *applet)
{
- if (main_window)
- gtk_window_set_transient_for (GTK_WINDOW(prefs.dialog), main_window);
+ GtkWindow *parent = ka_applet_last_focused_window (applet);
+
+ if (parent)
+ gtk_window_set_transient_for (GTK_WINDOW(prefs.dialog),
+ GTK_WINDOW(parent));
gtk_window_present (GTK_WINDOW(prefs.dialog));
gtk_dialog_run (GTK_DIALOG (prefs.dialog));
gtk_widget_hide (prefs.dialog);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/ka-preferences.h new/krb5-auth-dialog-3.8.0/src/ka-preferences.h
--- old/krb5-auth-dialog-3.7.92/src/ka-preferences.h 2013-03-15 15:16:21.000000000 +0100
+++ new/krb5-auth-dialog-3.8.0/src/ka-preferences.h 2013-03-25 12:03:00.000000000 +0100
@@ -11,7 +11,7 @@
void ka_preferences_window_create (KaApplet *applet, GtkBuilder *xml);
void ka_preferences_window_destroy (void);
-void ka_preferences_window_show (GtkWindow *main_window);
+void ka_preferences_window_show (KaApplet *applet);
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/ka-tools.c new/krb5-auth-dialog-3.8.0/src/ka-tools.c
--- old/krb5-auth-dialog-3.7.92/src/ka-tools.c 2011-09-04 21:50:20.000000000 +0200
+++ new/krb5-auth-dialog-3.8.0/src/ka-tools.c 2013-03-25 12:03:00.000000000 +0100
@@ -58,8 +58,10 @@
void
-ka_show_about ()
+ka_show_about (KaApplet *applet)
{
+ GtkWindow *parent = ka_applet_last_focused_window (applet);
+
const gchar *authors[] = {
"Christopher Aillon ",
"Jonathan Blandford ",
@@ -68,7 +70,7 @@
NULL
};
- gtk_show_about_dialog (NULL,
+ gtk_show_about_dialog (parent,
"authors", authors,
"version", VERSION,
"logo-icon-name", "krb-valid-ticket",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/ka-tools.h new/krb5-auth-dialog-3.8.0/src/ka-tools.h
--- old/krb5-auth-dialog-3.7.92/src/ka-tools.h 2011-09-04 21:50:20.000000000 +0200
+++ new/krb5-auth-dialog-3.8.0/src/ka-tools.h 2013-03-25 12:03:00.000000000 +0100
@@ -22,11 +22,12 @@
#define KA_TOOLS
#include
+#include
G_BEGIN_DECLS
void ka_show_help (GdkScreen* screen, const char* section, GtkWindow* window);
-void ka_show_about (void);
+void ka_show_about (KaApplet *applet);
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-auth-dialog-3.7.92/src/krb5-auth-dialog.ui new/krb5-auth-dialog-3.8.0/src/krb5-auth-dialog.ui
--- old/krb5-auth-dialog-3.7.92/src/krb5-auth-dialog.ui 2011-09-06 12:36:43.000000000 +0200
+++ new/krb5-auth-dialog-3.8.0/src/krb5-auth-dialog.ui 2013-03-25 12:03:00.000000000 +0100
@@ -1,6 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
+ <menu id="app-menu">
+ <section>
+ <item>
+ <attribute name="action">app.preferences</attribute>
+ <attribute name="label" translatable="yes">Prefere_nces</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="action">app.about</attribute>
+ <attribute name="label" translatable="yes">_About</attribute>
+ </item>
+ <item>
+ <attribute name="action">app.help</attribute>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="action">app.quit</attribute>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ </item>
+ </section>
+ </menu>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -29,7 +53,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -46,7 +69,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -181,7 +203,7 @@
<action-widget response="-5">krb5_renew_button</action-widget>
</action-widgets>
</object>
- <object class="GtkWindow" id="krb5_main_window">
+ <object class="GtkApplicationWindow" id="krb5_main_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Service Tickets</property>
<signal name="delete-event" handler="ka_main_window_hide" swapped="no"/>
@@ -190,102 +212,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="menuitem1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem" id="menuitem_close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="menuitem2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem" id="menuitem_preferences">
- <property name="label">gtk-preferences</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="menuitem4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem" id="menuitem_help_contents">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="menuitem_about">
- <property name="label">gtk-about</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkTreeView" id="krb5_tickets_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -324,7 +250,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -541,7 +466,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">If checked, request forwardable tickets</property>
<property name="tooltip_text" translatable="yes">If checked, request forwardable tickets</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -583,7 +507,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">If checked, request renewable tickets</property>
<property name="tooltip_text" translatable="yes">If checked, request renewable tickets</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -625,7 +548,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">If checked, request proxiable tickets</property>
<property name="tooltip_text" translatable="yes">If checked, request proxiable tickets</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -744,7 +666,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property>
<property name="tooltip_text" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -799,7 +720,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -892,7 +812,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1019,9 +938,9 @@
<property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
- <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="expand">False</property>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org