diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 39 | ||||
| -rw-r--r-- | src/ka-applet-priv.h | 2 | ||||
| -rw-r--r-- | src/ka-applet.c | 2 | ||||
| -rw-r--r-- | src/ka-applet.h | 2 | ||||
| -rw-r--r-- | src/ka-dbus.c | 2 | ||||
| -rw-r--r-- | src/ka-dbus.h | 2 | ||||
| -rw-r--r-- | src/ka-entry-buffer.c | 2 | ||||
| -rw-r--r-- | src/ka-entry-buffer.h | 2 | ||||
| -rw-r--r-- | src/ka-kerberos.h | 2 | ||||
| -rw-r--r-- | src/ka-main-window.c | 2 | ||||
| -rw-r--r-- | src/ka-main-window.h | 2 | ||||
| -rw-r--r-- | src/ka-pwdialog.c | 4 | ||||
| -rw-r--r-- | src/ka-pwdialog.h | 2 | ||||
| -rw-r--r-- | src/ka-settings.c | 2 | ||||
| -rw-r--r-- | src/ka-settings.h | 2 | ||||
| -rw-r--r-- | src/ka-tools.c | 2 | ||||
| -rw-r--r-- | src/ka-tools.h | 2 | ||||
| -rw-r--r-- | src/krb5-auth-dialog.appdata.xml.in | 6 | ||||
| -rw-r--r-- | src/krb5-auth-dialog.desktop.in | 1 | ||||
| -rw-r--r-- | src/resources.c | 41 |
20 files changed, 86 insertions, 35 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index d509280..d90d281 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,15 +91,14 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = krb5-auth-dialog$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/krb5-auth-dialog.1.in $(top_srcdir)/depcomp \ - $(dist_convert_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4/compiler-flags.m4 \ - $(top_srcdir)/m4/gnome-doc-utils.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/compiler-flags.m4 $(top_srcdir)/m4/yelp.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_convert_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = krb5-auth-dialog.1 @@ -221,6 +230,8 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(srcdir)/krb5-auth-dialog.1.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -243,9 +254,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -283,6 +292,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ @@ -301,6 +311,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -315,7 +326,6 @@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -346,7 +356,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_PYTHON_CFLAGS = @WARN_PYTHON_CFLAGS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ YACC = @YACC@ +YELP_LC_DIST = @YELP_LC_DIST@ +YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -397,6 +410,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -534,7 +548,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1221,6 +1234,8 @@ uninstall-man: uninstall-man1 uninstall-desktopDATA uninstall-dist_convertDATA uninstall-man \ uninstall-man1 uninstall-serviceDATA +.PRECIOUS: Makefile + @INTLTOOL_DESKTOP_RULE@ @GSETTINGS_RULES@ diff --git a/src/ka-applet-priv.h b/src/ka-applet-priv.h index d9c0bd4..67fb601 100644 --- a/src/ka-applet-priv.h +++ b/src/ka-applet-priv.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2008,2010,2011 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-applet.c b/src/ka-applet.c index 1a2315c..195f781 100644 --- a/src/ka-applet.c +++ b/src/ka-applet.c @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2008,2009,2010,2013 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-applet.h b/src/ka-applet.h index 1e6f3e0..bf4febe 100644 --- a/src/ka-applet.h +++ b/src/ka-applet.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2008 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-dbus.c b/src/ka-dbus.c index 75949ee..7d4bb1c 100644 --- a/src/ka-dbus.c +++ b/src/ka-dbus.c @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2008,2009,2011 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-dbus.h b/src/ka-dbus.h index d64f00e..d482029 100644 --- a/src/ka-dbus.h +++ b/src/ka-dbus.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2008 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-entry-buffer.c b/src/ka-entry-buffer.c index 8cdd630..76256be 100644 --- a/src/ka-entry-buffer.c +++ b/src/ka-entry-buffer.c @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2010 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-entry-buffer.h b/src/ka-entry-buffer.h index 4bb13f2..108126c 100644 --- a/src/ka-entry-buffer.h +++ b/src/ka-entry-buffer.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2010 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-kerberos.h b/src/ka-kerberos.h index e94bb63..c4eeb26 100644 --- a/src/ka-kerberos.h +++ b/src/ka-kerberos.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2008 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-main-window.c b/src/ka-main-window.c index 0a1a548..21b1dbc 100644 --- a/src/ka-main-window.c +++ b/src/ka-main-window.c @@ -1,6 +1,6 @@ /* -*- c-file-style: "linux"; c-basic-offset: 4; indent-tabs-mode: nil; -*- * * - * Krb5 Auth Applet -- Acquire and release kerberos tickets + * Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2009,2011,2013 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-main-window.h b/src/ka-main-window.h index cee3f8f..fba17ee 100644 --- a/src/ka-main-window.h +++ b/src/ka-main-window.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2009 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c index 005a833..0cca259 100644 --- a/src/ka-pwdialog.c +++ b/src/ka-pwdialog.c @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2009,2013 Guido Guenther <agx@sigxcpu.org> * @@ -306,7 +306,7 @@ ka_pwdialog_error (KaPwDialog *self, const char *msg) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _ - ("Couldn't acquire kerberos ticket: '%s'"), + ("Couldn't acquire Kerberos ticket: '%s'"), _(msg)); gtk_widget_show (GTK_WIDGET (dialog)); gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/src/ka-pwdialog.h b/src/ka-pwdialog.h index a69c351..bf384b1 100644 --- a/src/ka-pwdialog.h +++ b/src/ka-pwdialog.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2009 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-settings.c b/src/ka-settings.c index 6ccb45a..2f66dfc 100644 --- a/src/ka-settings.c +++ b/src/ka-settings.c @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2008,2009,2013 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-settings.h b/src/ka-settings.h index 6870c81..d8588e7 100644 --- a/src/ka-settings.h +++ b/src/ka-settings.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2008 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/ka-tools.c b/src/ka-tools.c index 6e58334..ae93803 100644 --- a/src/ka-tools.c +++ b/src/ka-tools.c @@ -30,7 +30,7 @@ ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window) if (chapter) section = chapter; - url = g_strdup_printf("ghelp:krb5-auth-dialog%s", section); + url = g_strdup_printf("help:krb5-auth-dialog%s", section); gtk_show_uri (screen, url, gtk_get_current_event_time (), &error); diff --git a/src/ka-tools.h b/src/ka-tools.h index 2fb31aa..9cbf1ae 100644 --- a/src/ka-tools.h +++ b/src/ka-tools.h @@ -1,4 +1,4 @@ -/* Krb5 Auth Applet -- Acquire and release kerberos tickets +/* Krb5 Auth Applet -- Acquire and release Kerberos tickets * * (C) 2009 Guido Guenther <agx@sigxcpu.org> * diff --git a/src/krb5-auth-dialog.appdata.xml.in b/src/krb5-auth-dialog.appdata.xml.in index 0e4ef2d..b3e6ad2 100644 --- a/src/krb5-auth-dialog.appdata.xml.in +++ b/src/krb5-auth-dialog.appdata.xml.in @@ -20,4 +20,10 @@ </screenshots> <url type="homepage">https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/</url> <updatecontact>agx_at_sigxcpu.org</updatecontact> + <kudos> + <kudo>AppMenu</kudo> + <kudo>HiDpiIcon</kudo> + <kudo>ModernToolkit</kudo> + <kudo>Notifications</kudo> + </kudos> </application> diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in index 33ac10d..de7168a 100644 --- a/src/krb5-auth-dialog.desktop.in +++ b/src/krb5-auth-dialog.desktop.in @@ -6,6 +6,7 @@ Terminal=false Type=Application Icon=krb-valid-ticket Categories=GNOME;GTK;Utility;Network; +_Keywords=kerberos;authentication; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=krb5-auth-dialog X-GNOME-Bugzilla-Component=general diff --git a/src/resources.c b/src/resources.c index cdebea8..6428ecc 100644 --- a/src/resources.c +++ b/src/resources.c @@ -4022,6 +4022,8 @@ GResource *krb5_auth_dialog_get_resource (void) */ +#ifndef __GTK_DOC_IGNORE__ + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) #define G_HAS_CONSTRUCTORS 1 @@ -4034,17 +4036,43 @@ GResource *krb5_auth_dialog_get_resource (void) #define G_HAS_CONSTRUCTORS 1 -#define G_DEFINE_CONSTRUCTOR(_func) \ +/* We do some weird things to avoid the constructors being optimized + * away on VS2015 if WholeProgramOptimization is enabled. First we + * make a reference to the array from the wrapper to make sure its + * references. Then we use a pragma to make sure the wrapper function + * symbol is always included at the link stage. Also, the symbols + * need to be extern (but not dllexport), even though they are not + * really used from another object file. + */ + +/* We need to account for differences between the mangling of symbols + * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed + * with an underscore but symbols on x64 are not. + */ +#ifdef _WIN64 +#define G_MSVC_SYMBOL_PREFIX "" +#else +#define G_MSVC_SYMBOL_PREFIX "_" +#endif + +#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) +#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX) + +#define G_MSVC_CTOR(_func,_sym_prefix) \ static void _func(void); \ - static int _func ## _wrapper(void) { _func(); return 0; } \ + extern int (* _array ## _func)(void); \ + int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \ __pragma(section(".CRT$XCU",read)) \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper; + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper; -#define G_DEFINE_DESTRUCTOR(_func) \ +#define G_MSVC_DTOR(_func,_sym_prefix) \ static void _func(void); \ - static int _func ## _constructor(void) { atexit (_func); return 0; } \ + extern int (* _array ## _func)(void); \ + int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \ __pragma(section(".CRT$XCU",read)) \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor; #elif defined (_MSC_VER) @@ -4095,6 +4123,7 @@ GResource *krb5_auth_dialog_get_resource (void) #endif +#endif /* __GTK_DOC_IGNORE__ */ #ifdef G_HAS_CONSTRUCTORS |