Merge commit 'upstream/3.2.0'

1 files changed, 339 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c252f9..4cd07a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,344 @@
 # Generated by Makefile. Do not edit.
 
+commit 1c89fe8b203c85dcb4ff06fb8da34e411eb56730
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 26 22:13:36 2011 +0200
+
+    Bump version to 3.2.0
+
+ NEWS         |   13 +++++++++++++
+ configure.ac |    2 +-
+ 2 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 72886265ec4f518e32ef178cea806b336844ecec
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 26 22:06:12 2011 +0200
+
+    Avoid crash by not settings string columns to 0
+
+ src/ka-kerberos.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 42eaa5d3e594b69a555423e2a7c2c04fcb25465d
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:   Mon Sep 19 21:52:10 2011 +0200
+
+    [l10n] Updated German translation
+
+ po/de.po |  358 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 183 insertions(+), 175 deletions(-)
+
+commit 8efd67bb6f69ee690ea51f48a37d21cdc766e2c2
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Thu Sep 15 12:25:21 2011 +0200
+
+    autogen.sh: look for ka-kerberos.c
+
+ autogen.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bbe15a3a7c0d5154332e64a3bb7fbe2367056400
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 12 16:34:37 2011 +0200
+
+    Add translator hints
+
+ src/ka-main-window.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 9266c74980f52605d039cc0b6530c0a17917f6e2
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 12 12:23:13 2011 +0200
+
+    Require GTK+3.0
+    
+    since GtkApplication is 3.0 only
+
+ configure.ac |   30 +++++-------------------------
+ 1 files changed, 5 insertions(+), 25 deletions(-)
+
+commit d8efe4a8fe5152f8c53c005fb0830ef80fce8a9d
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 12 12:16:50 2011 +0200
+
+    Don't try to free invalid context
+
+ src/ka-kerberos.c |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 25d0d29c28cc7b6038a441f8f1ca97deefcd14db
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 12 10:51:06 2011 +0200
+
+    Rename ka-dialog to ka-kerberos
+    
+    We finally moved the startup code out there.
+
+ configure.ac         |    2 +-
+ po/POTFILES.in       |    2 +-
+ src/Makefile.am      |    4 +-
+ src/ka-applet.c      |    2 +-
+ src/ka-dbus.c        |    2 +-
+ src/ka-dialog.c      | 1110 --------------------------------------------------
+ src/ka-dialog.h      |   35 --
+ src/ka-kerberos.c    | 1110 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/ka-kerberos.h    |   35 ++
+ src/ka-main-window.c |    2 +-
+ src/ka-pwdialog.c    |    2 +-
+ 11 files changed, 1153 insertions(+), 1153 deletions(-)
+
+commit 9b3059c3b60f586d344d06cc3227ee9b7bee1bb6
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 12 10:43:57 2011 +0200
+
+    Move main() into ka-applet
+
+ src/ka-applet.c |   26 +++++++++++++++++++++++---
+ src/ka-dialog.c |   23 +----------------------
+ 2 files changed, 24 insertions(+), 25 deletions(-)
+
+commit 5de82603dd831a13754a139c6eb80d9d87d4b27d
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Sep 10 14:57:34 2011 +0200
+
+    Remove NoDisplay=true from desktop file
+    
+    since we now use it to edit the prefs.
+
+ src/krb5-auth-dialog.desktop.in |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit adc616b490faccbec37aed550002b3e3f8b0169c
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 11 14:49:24 2011 +0200
+
+    Show main window when krb5-auth-dialog is invoked again
+
+ src/ka-applet.c |  107 ++++++++++++++++++++++++++++++++++++++++++++++++------
+ src/ka-dialog.c |   61 ++++++++++++-------------------
+ 2 files changed, 118 insertions(+), 50 deletions(-)
+
+commit 819f5ea45868fad8ed9ae47d2c99862520846eda
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 11 13:35:30 2011 +0200
+
+    Invoke Kerberos related initialization from applet
+    
+    instead from within main.
+
+ src/ka-applet.c |   23 +++++++++++++++++++++++
+ src/ka-dialog.c |   43 +++++++++++++++++++++++++------------------
+ src/ka-dialog.h |    3 +++
+ 3 files changed, 51 insertions(+), 18 deletions(-)
+
+commit 072bf062baf562bcf35436c5ebb62919cdf069e4
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 11 10:59:14 2011 +0200
+
+    Use GtkApplication
+    
+    to work towards better singleton operation. Since GApplication acquires
+    the DBus name already don't try to own the name in ka-dbus again.
+
+ src/ka-applet.c |   16 ++++++++++------
+ src/ka-dbus.c   |   41 +++++++++--------------------------------
+ src/ka-dialog.c |    2 +-
+ 3 files changed, 20 insertions(+), 39 deletions(-)
+
+commit 19bb938a2bb502640f53a25f452e400dd0f68d5a
+Author: Zdeněk Hataš <zdenek.hatas@gmail.com>
+Date:   Fri Sep 9 12:01:57 2011 +0200
+
+    Updated Czech translation
+
+ po/cs.po |  202 +++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 103 insertions(+), 99 deletions(-)
+
+commit 8b53aed4c6ae13782b68b51fbdafba83f2da61f8
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:   Wed Sep 7 21:28:35 2011 +0200
+
+    Updated Slovenian translation
+
+ po/sl.po |  329 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 169 insertions(+), 160 deletions(-)
+
+commit 9687ba4ba4c547436a122f21129bc6251a8b4a49
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Tue Sep 6 16:36:32 2011 +0200
+
+    build: Really drop libgnome-control-center dependency
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=658364
+
+ configure.ac |    8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+commit 1fec2e02597926de3921da4b462610779a1333bf
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Tue Sep 6 12:37:28 2011 +0200
+
+    Bump version to 3.1.91
+
+ NEWS         |   12 ++++++++++++
+ configure.ac |    2 +-
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+commit becb3cadc883efcd444b9ffbccdd5ac535062feb
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Tue Sep 6 10:53:37 2011 +0200
+
+    Remove items moved to ticket dialog
+
+ src/ka-applet.c |   50 +-------------------------------------------------
+ 1 files changed, 1 insertions(+), 49 deletions(-)
+
+commit 3fe50f6c8450f1eb38dbb249c89b92ff51032ed3
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 4 21:52:47 2011 +0200
+
+    Add preferences dialog instead of using the cc-panel
+    
+    BZ: #657292
+
+ Makefile.am                        |    2 +-
+ cc-panel/Makefile.am               |   55 ---
+ cc-panel/cc-ka-panel.c             |  784 -----------------------------------
+ cc-panel/cc-ka-panel.h             |   45 --
+ cc-panel/gnome-ka-panel.desktop.in |   17 -
+ cc-panel/ka-module.c               |   20 -
+ cc-panel/ka-panel.ui               |  732 ---------------------------------
+ configure.ac                       |    1 -
+ po/POTFILES.in                     |    4 +-
+ src/Makefile.am                    |    2 +
+ src/ka-applet.c                    |    3 +
+ src/ka-main-window.c               |    3 +-
+ src/ka-preferences.c               |  689 +++++++++++++++++++++++++++++++
+ src/ka-preferences.h               |   21 +
+ src/krb5-auth-dialog.ui            |  794 ++++++++++++++++++++++++++++++++++++
+ 15 files changed, 1513 insertions(+), 1659 deletions(-)
+
+commit 58680535a6fb6e860276d05703341f5fc505149c
+Author: dmustieles <daniel.mustieles@gmail.com>
+Date:   Mon Sep 5 13:54:59 2011 +0200
+
+    Updated Spanish translation
+
+ po/es.po |   81 ++++++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 45 insertions(+), 36 deletions(-)
+
+commit 030d15751d0ab74b0624680f696248747fd1d562
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 4 20:08:28 2011 +0200
+
+    Wire up about dialog
+
+ src/ka-applet.c      |   23 +----------------------
+ src/ka-main-window.c |    2 +-
+ src/ka-tools.c       |   28 ++++++++++++++++++++++++++++
+ src/ka-tools.h       |    1 +
+ 4 files changed, 31 insertions(+), 23 deletions(-)
+
+commit 604cd3bbf5ed06f45d06d89c62a13b05c85e6510
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 4 19:05:08 2011 +0200
+
+    Add menu bar to main window
+
+ src/ka-main-window.c    |   64 +++++++++++++-
+ src/ka-main-window.h    |    2 +-
+ src/krb5-auth-dialog.ui |  211 +++++++++++++++++++++++++++++++++++++----------
+ 3 files changed, 226 insertions(+), 51 deletions(-)
+
+commit 88d1f28b5aa86aba5cf4d46f719fe2ca5c9f1040
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 4 19:20:12 2011 +0200
+
+    Name callbacks consistently
+
+ src/ka-applet.c |   24 ++++++++++++------------
+ 1 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 53dfb8407380dd82d32f80c5deed39da1f982cfa
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 4 18:47:32 2011 +0200
+
+    Update the main window's ticket list when the ccache changes
+    
+    Introduce a krb-ccache-changed signal for that.
+
+ src/ka-applet-priv.h |    4 +++-
+ src/ka-applet.c      |   12 +++++++++---
+ src/ka-dbus.c        |    2 +-
+ src/ka-dialog.c      |    7 ++++---
+ src/ka-main-window.c |   14 +++++++++++++-
+ src/ka-main-window.h |    4 +++-
+ 6 files changed, 33 insertions(+), 10 deletions(-)
+
+commit 47bdf47feaa0a4b5fd9fd05e96f4b1f4a4eca49c
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 4 15:31:44 2011 +0200
+
+    Make the tickets dialog the main window
+    
+    instead of a dialog
+
+ po/POTFILES.in          |    2 +-
+ src/Makefile.am         |    4 +-
+ src/ka-applet.c         |   10 ++--
+ src/ka-dialog.c         |    2 +-
+ src/ka-main-window.c    |  123 +++++++++++++++++++++++++++++++++++++++++++++++
+ src/ka-main-window.h    |   40 +++++++++++++++
+ src/ka-tickets.c        |  116 --------------------------------------------
+ src/ka-tickets.h        |   39 ---------------
+ src/krb5-auth-dialog.ui |   61 +++++-------------------
+ 9 files changed, 184 insertions(+), 213 deletions(-)
+
+commit 371720a2b70b968dfcaaf5b7de0d0826c985a050
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Sep 4 16:05:54 2011 +0200
+
+    Connect GtkBuilder signals
+
+ src/ka-applet.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 8c1a20fbfee1c1ed6ad3002e169c939ad9e87477
+Author: Fran Dieguez <fran@openhost.es>
+Date:   Tue Aug 16 23:00:21 2011 +0200
+
+    Updated Galician translations
+
+ po/gl.po |  293 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 166 insertions(+), 127 deletions(-)
+
+commit 7a7a51829f6fa07470f311b8d090569a9845c791
+Author: Aron Xu <aronxu@gnome.org>
+Date:   Tue Aug 16 15:22:10 2011 +0000
+
+    Update Simplified Chinese translation.
+
+ po/zh_CN.po |  413 +++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 221 insertions(+), 192 deletions(-)
+
+commit f12286399ca209b31ca17d4162fbf99ed6968b36
+Author: Petr Kovar <pkovar@redhat.com>
+Date:   Fri Jun 10 15:57:05 2011 +0200
+
+    Fix Czech translation
+
+ po/cs.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 905cb444e01794557d038c4547d483a18f2a46cf
+Author: Petr Kovar <pkovar@redhat.com>
+Date:   Fri Jun 10 15:52:51 2011 +0200
+
+    Update Czech translation by Zdenek Hatas
+
+ po/cs.po |  347 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 187 insertions(+), 160 deletions(-)
+
 commit 2b27db7f8d18d7d6d473a1efd093a1fe0e646981
 Author: Guido Günther <agx@sigxcpu.org>
 Date:   Sun Apr 24 15:56:52 2011 +0200