Merge tag 'upstream/3.12.0'

Upstream version 3.12.0

# gpg: Signature made Fr 20 Jun 2014 06:48:55 CEST
# 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>"

1 files changed, 6 insertions, 2 deletions

diff --git a/src/ka-applet.c b/src/ka-applet.c
index 2b48825..8b99695 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -151,6 +150,7 @@ ka_applet_local_command_line (GApplication *application,
     GError *error = NULL;
 
     gint argc = g_strv_length (*argv);
+    gint flags;
     gboolean auto_run = FALSE;
 
     const char *help_msg =
@@ -163,6 +163,10 @@ ka_applet_local_command_line (GApplication *application,
     };
 
     KA_DEBUG ("Parsing local command line");
+#if GLIB_CHECK_VERSION(2, 40, 0)
+    flags = g_application_get_flags(application);
+    g_application_set_flags(application, flags | G_APPLICATION_HANDLES_COMMAND_LINE);
+#endif
 
     context = g_option_context_new ("- Kerberos 5 credential checking");
     g_option_context_add_main_entries (context, options, NULL);