diff options
Diffstat (limited to 'preferences')
| -rw-r--r-- | preferences/Makefile.am | 2 | ||||
| -rw-r--r-- | preferences/Makefile.in | 25 | ||||
| -rw-r--r-- | preferences/krb5-auth-dialog-preferences.c | 32 | ||||
| -rw-r--r-- | preferences/krb5-auth-dialog-preferences.desktop.in | 4 | ||||
| -rw-r--r-- | preferences/krb5-auth-dialog-preferences.xml | 61 |
5 files changed, 66 insertions, 58 deletions
diff --git a/preferences/Makefile.am b/preferences/Makefile.am index 56d93cb..48c9be0 100644 --- a/preferences/Makefile.am +++ b/preferences/Makefile.am @@ -6,6 +6,8 @@ krb5_auth_dialog_preferences_SOURCES = \ krb5-auth-dialog-preferences.c \ $(top_srcdir)/src/krb5-auth-gconf-tools.c \ $(top_srcdir)/src/krb5-auth-gconf-tools.h \ + $(top_srcdir)/src/krb5-auth-tools.c \ + $(top_srcdir)/src/krb5-auth-tools.h \ $(NULL) krb5_auth_dialog_preferences_CPPFLAGS = \ diff --git a/preferences/Makefile.in b/preferences/Makefile.in index decfae8..4445e9e 100644 --- a/preferences/Makefile.in +++ b/preferences/Makefile.in @@ -37,7 +37,8 @@ subdir = preferences DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4/compiler-flags.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/compiler-flags.m4 \ + $(top_srcdir)/m4/gnome-doc-utils.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -50,6 +51,7 @@ PROGRAMS = $(bin_PROGRAMS) am__objects_1 = am_krb5_auth_dialog_preferences_OBJECTS = krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.$(OBJEXT) \ krb5_auth_dialog_preferences-krb5-auth-gconf-tools.$(OBJEXT) \ + krb5_auth_dialog_preferences-krb5-auth-tools.$(OBJEXT) \ $(am__objects_1) krb5_auth_dialog_preferences_OBJECTS = \ $(am_krb5_auth_dialog_preferences_OBJECTS) @@ -109,6 +111,8 @@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -132,6 +136,7 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -173,6 +178,7 @@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -259,6 +265,8 @@ krb5_auth_dialog_preferences_SOURCES = \ krb5-auth-dialog-preferences.c \ $(top_srcdir)/src/krb5-auth-gconf-tools.c \ $(top_srcdir)/src/krb5-auth-gconf-tools.h \ + $(top_srcdir)/src/krb5-auth-tools.c \ + $(top_srcdir)/src/krb5-auth-tools.h \ $(NULL) krb5_auth_dialog_preferences_CPPFLAGS = \ @@ -368,6 +376,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -418,6 +427,20 @@ krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj: $(top_srcdir)/src/krb5-a @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-gconf-tools.c'; fi` +krb5_auth_dialog_preferences-krb5-auth-tools.o: $(top_srcdir)/src/krb5-auth-tools.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-tools.o `test -f '$(top_srcdir)/src/krb5-auth-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-tools.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/krb5-auth-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-tools.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-tools.o `test -f '$(top_srcdir)/src/krb5-auth-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-tools.c + +krb5_auth_dialog_preferences-krb5-auth-tools.obj: $(top_srcdir)/src/krb5-auth-tools.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-tools.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/krb5-auth-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-tools.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-tools.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff --git a/preferences/krb5-auth-dialog-preferences.c b/preferences/krb5-auth-dialog-preferences.c index c0d75c6..4edd565 100644 --- a/preferences/krb5-auth-dialog-preferences.c +++ b/preferences/krb5-auth-dialog-preferences.c @@ -34,6 +34,7 @@ #include <glib/gi18n.h> #include "krb5-auth-gconf-tools.h" +#include "krb5-auth-tools.h" #define N_LISTENERS 8 @@ -560,40 +561,13 @@ ka_preferences_dialog_response (GtkWidget *widget, int response, KaPreferencesDialog *dialog) { - GError *error = NULL; - if (response != GTK_RESPONSE_HELP) { gtk_widget_destroy (widget); return; } -#if GTK_CHECK_VERSION(2, 14, 0) - gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog->dialog)), - "ghelp:krb5-auth-dialog#preferences", - gtk_get_current_event_time (), &error); -#else - g_warning("gtk_show_uri unavailable"); -#endif - - if (error) { - GtkWidget *message_dialog; - - - message_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog->dialog), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - _("There was an error displaying help:\n%s"), - error->message); - 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); - g_error_free (error); - } + ka_show_help (gtk_window_get_screen (GTK_WINDOW (dialog->dialog)), + "#preferences", GTK_WINDOW(dialog->dialog)); } diff --git a/preferences/krb5-auth-dialog-preferences.desktop.in b/preferences/krb5-auth-dialog-preferences.desktop.in index d87e1e7..954a69e 100644 --- a/preferences/krb5-auth-dialog-preferences.desktop.in +++ b/preferences/krb5-auth-dialog-preferences.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] _Name=Network Authentication -_Comment=Set your Kerberos network authenticaion preferences +_Comment=Set your Kerberos network authentication preferences Exec=krb5-auth-dialog-preferences -Icon=gtk-dialog-authentication +Icon=krb-valid-ticket Terminal=false Type=Application StartupNotify=true diff --git a/preferences/krb5-auth-dialog-preferences.xml b/preferences/krb5-auth-dialog-preferences.xml index 5bb48bd..6ac12bc 100644 --- a/preferences/krb5-auth-dialog-preferences.xml +++ b/preferences/krb5-auth-dialog-preferences.xml @@ -6,7 +6,7 @@ <property name="border_width">5</property> <property name="title" translatable="yes">Kerberos Authentication Configuration</property> <property name="window_position">center-on-parent</property> - <property name="icon_name">gtk-dialog-authentication</property> + <property name="icon_name">krb-valid-ticket</property> <property name="type_hint">dialog</property> <property name="has_separator">False</property> <child internal-child="vbox"> @@ -30,8 +30,10 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Kerberos User</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Kerberos User</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -47,7 +49,7 @@ <object class="GtkImage" id="access"> <property name="visible">True</property> <property name="yalign">0</property> - <property name="icon_name">gtk-dialog-authentication</property> + <property name="icon_name">krb-valid-ticket</property> <property name="icon-size">6</property> </object> <packing> @@ -79,7 +81,7 @@ <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> </object> <packing> <property name="expand">False</property> @@ -106,7 +108,7 @@ <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">PKINIT userid: </property> + <property name="label" translatable="yes">PKINIT userid:</property> </object> <packing> <property name="expand">False</property> @@ -121,7 +123,7 @@ <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> </object> <packing> <property name="expand">False</property> @@ -149,7 +151,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">PKINT anchors:</property> + <property name="label" translatable="yes">PKINIT anchors:</property> </object> <packing> <property name="expand">False</property> @@ -164,7 +166,7 @@ <child> <object class="GtkLabel" id="label20"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> </object> <packing> <property name="expand">False</property> @@ -212,8 +214,10 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Ticket Options</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Ticket Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -258,7 +262,7 @@ <child> <object class="GtkLabel" id="label11"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> </object> <packing> <property name="expand">False</property> @@ -292,7 +296,7 @@ <child> <object class="GtkLabel" id="label12"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> </object> <packing> <property name="expand">False</property> @@ -326,7 +330,7 @@ <child> <object class="GtkLabel" id="label19"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> </object> <packing> <property name="expand">False</property> @@ -394,8 +398,10 @@ <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Notifications</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Notifications</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -427,7 +433,7 @@ <child> <object class="GtkLabel" id="label14"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> </object> <packing> <property name="expand">False</property> @@ -438,7 +444,7 @@ <child> <object class="GtkLabel" id="label15"> <property name="visible">True</property> - <property name="label" translatable="yes">Warn</property> + <property name="label" comments="Used in combination: 'Warn x minutes before expiry'" translatable="yes">Warn</property> </object> <packing> <property name="expand">False</property> @@ -450,7 +456,7 @@ <object class="GtkSpinButton" id="prompt_mins_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires. </property> + <property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property> <property name="activates_default">True</property> <property name="adjustment">adjustment1</property> </object> @@ -463,7 +469,7 @@ <child> <object class="GtkLabel" id="label16"> <property name="visible">True</property> - <property name="label" translatable="yes">minutes before expiry</property> + <property name="label" comments="Used in combination: 'Warn x minutes before expiry'" translatable="yes">minutes before expiry</property> </object> <packing> <property name="expand">False</property> @@ -497,8 +503,10 @@ <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Appearance</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Appearance</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -534,7 +542,7 @@ <child> <object class="GtkLabel" id="label13"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> </object> <packing> <property name="expand">False</property> @@ -548,7 +556,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, display the tray icon in the status bar.</property> + <property name="tooltip_text" translatable="yes">If checked, display the tray icon in the status bar</property> <property name="draw_indicator">True</property> </object> <packing> @@ -607,7 +615,8 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="button2"> - <property name="label" translatable="yes">gtk-help</property> + <property name="label">gtk-help</property> + <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> @@ -620,7 +629,7 @@ </child> <child> <object class="GtkButton" id="button1"> - <property name="label" translatable="yes">gtk-close</property> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> |