diff options
Diffstat (limited to 'preferences')
| -rw-r--r-- | preferences/Makefile.am | 37 | ||||
| -rw-r--r-- | preferences/Makefile.in | 114 | ||||
| -rw-r--r-- | preferences/krb5-auth-dialog-preferences.c | 31 | ||||
| -rw-r--r-- | preferences/krb5-auth-dialog-preferences.xml (renamed from preferences/krb5-auth-dialog-preferences.glade) | 347 |
4 files changed, 304 insertions, 225 deletions
diff --git a/preferences/Makefile.am b/preferences/Makefile.am index 83541ea..56d93cb 100644 --- a/preferences/Makefile.am +++ b/preferences/Makefile.am @@ -1,26 +1,33 @@ NULL = -INCLUDES = \ - -I $(top_srcdir)/src/ \ - -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ - -DLOCALE_DIR=\""$(localedir)/"\" \ - $(NULL) - bin_PROGRAMS = krb5-auth-dialog-preferences -schemadir = $(sysconfdir)/gconf/schemas - krb5_auth_dialog_preferences_SOURCES = \ krb5-auth-dialog-preferences.c \ - ../src/krb5-auth-gconf-tools.c \ - ../src/krb5-auth-gconf-tools.h \ + $(top_srcdir)/src/krb5-auth-gconf-tools.c \ + $(top_srcdir)/src/krb5-auth-gconf-tools.h \ $(NULL) +krb5_auth_dialog_preferences_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ + -DLOCALE_DIR=\""$(localedir)/"\" + $(AM_CPPFLAGS) + +krb5_auth_dialog_preferences_CFLAGS = \ + $(GTK_CFLAGS) \ + $(GCONF_CFLAGS) \ + $(AM_CFLAGS) + + krb5_auth_dialog_preferences_LDADD = \ - @GCONF_LIBS@ \ - @GLADE_LIBS@ \ - @GTK_LIBS@ \ - $(NULL) + $(GCONF_LIBS) \ + $(GTK_LIBS) \ + $(NULL) + +AM_CPPFLAGS = \ + $(DISABLE_DEPRECATED) \ + $(NULL) desktopdir = $(datadir)/applications desktop_in_files = krb5-auth-dialog-preferences.desktop.in @@ -30,7 +37,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) pkgdatadir = $(datadir)/krb5-auth-dialog pkgdata_DATA = \ - krb5-auth-dialog-preferences.glade + krb5-auth-dialog-preferences.xml CLEANFILES = \ $(desktop_DATA) \ diff --git a/preferences/Makefile.in b/preferences/Makefile.in index ab8a609..decfae8 100644 --- a/preferences/Makefile.in +++ b/preferences/Makefile.in @@ -48,13 +48,18 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am__objects_1 = -am_krb5_auth_dialog_preferences_OBJECTS = \ - krb5-auth-dialog-preferences.$(OBJEXT) \ - krb5-auth-gconf-tools.$(OBJEXT) $(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) \ + $(am__objects_1) krb5_auth_dialog_preferences_OBJECTS = \ $(am_krb5_auth_dialog_preferences_OBJECTS) am__DEPENDENCIES_1 = -krb5_auth_dialog_preferences_DEPENDENCIES = $(am__DEPENDENCIES_1) +krb5_auth_dialog_preferences_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +krb5_auth_dialog_preferences_LINK = $(LIBTOOL) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -98,10 +103,6 @@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -109,21 +110,23 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ -GLADE_CFLAGS = @GLADE_CFLAGS@ -GLADE_LIBS = @GLADE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -143,6 +146,7 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -153,6 +157,7 @@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -164,8 +169,12 @@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -196,8 +205,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -229,6 +237,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ minimum_lifetime = @minimum_lifetime@ mkdir_p = @mkdir_p@ @@ -246,30 +255,36 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = -INCLUDES = \ - -I $(top_srcdir)/src/ \ - -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ - -DLOCALE_DIR=\""$(localedir)/"\" \ - $(NULL) - -schemadir = $(sysconfdir)/gconf/schemas krb5_auth_dialog_preferences_SOURCES = \ krb5-auth-dialog-preferences.c \ - ../src/krb5-auth-gconf-tools.c \ - ../src/krb5-auth-gconf-tools.h \ + $(top_srcdir)/src/krb5-auth-gconf-tools.c \ + $(top_srcdir)/src/krb5-auth-gconf-tools.h \ $(NULL) +krb5_auth_dialog_preferences_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ + -DLOCALE_DIR=\""$(localedir)/"\" + +krb5_auth_dialog_preferences_CFLAGS = \ + $(GTK_CFLAGS) \ + $(GCONF_CFLAGS) \ + $(AM_CFLAGS) + krb5_auth_dialog_preferences_LDADD = \ - @GCONF_LIBS@ \ - @GLADE_LIBS@ \ - @GTK_LIBS@ \ - $(NULL) + $(GCONF_LIBS) \ + $(GTK_LIBS) \ + $(NULL) + +AM_CPPFLAGS = \ + $(DISABLE_DEPRECATED) \ + $(NULL) desktopdir = $(datadir)/applications desktop_in_files = krb5-auth-dialog-preferences.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) pkgdata_DATA = \ - krb5-auth-dialog-preferences.glade + krb5-auth-dialog-preferences.xml CLEANFILES = \ $(desktop_DATA) \ @@ -343,7 +358,7 @@ clean-binPROGRAMS: done krb5-auth-dialog-preferences$(EXEEXT): $(krb5_auth_dialog_preferences_OBJECTS) $(krb5_auth_dialog_preferences_DEPENDENCIES) @rm -f krb5-auth-dialog-preferences$(EXEEXT) - $(LINK) $(krb5_auth_dialog_preferences_OBJECTS) $(krb5_auth_dialog_preferences_LDADD) $(LIBS) + $(krb5_auth_dialog_preferences_LINK) $(krb5_auth_dialog_preferences_OBJECTS) $(krb5_auth_dialog_preferences_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -351,8 +366,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-auth-dialog-preferences.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-auth-gconf-tools.Po@am__quote@ +@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@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -375,19 +390,33 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -krb5-auth-gconf-tools.o: ../src/krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT krb5-auth-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5-auth-gconf-tools.Tpo -c -o krb5-auth-gconf-tools.o `test -f '../src/krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`../src/krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5-auth-gconf-tools.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../src/krb5-auth-gconf-tools.c' object='krb5-auth-gconf-tools.o' libtool=no @AMDEPBACKSLASH@ +krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o: krb5-auth-dialog-preferences.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-dialog-preferences.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o `test -f 'krb5-auth-dialog-preferences.c' || echo '$(srcdir)/'`krb5-auth-dialog-preferences.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-dialog-preferences.c' object='krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.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-dialog-preferences.o `test -f 'krb5-auth-dialog-preferences.c' || echo '$(srcdir)/'`krb5-auth-dialog-preferences.c + +krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj: krb5-auth-dialog-preferences.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-dialog-preferences.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj `if test -f 'krb5-auth-dialog-preferences.c'; then $(CYGPATH_W) 'krb5-auth-dialog-preferences.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dialog-preferences.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-dialog-preferences.c' object='krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.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-dialog-preferences.obj `if test -f 'krb5-auth-dialog-preferences.c'; then $(CYGPATH_W) 'krb5-auth-dialog-preferences.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dialog-preferences.c'; fi` + +krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o: $(top_srcdir)/src/krb5-auth-gconf-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-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o `test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-gconf-tools.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/krb5-auth-gconf-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o krb5-auth-gconf-tools.o `test -f '../src/krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`../src/krb5-auth-gconf-tools.c +@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.o `test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-gconf-tools.c -krb5-auth-gconf-tools.obj: ../src/krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT krb5-auth-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5-auth-gconf-tools.Tpo -c -o krb5-auth-gconf-tools.obj `if test -f '../src/krb5-auth-gconf-tools.c'; then $(CYGPATH_W) '../src/krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/../src/krb5-auth-gconf-tools.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5-auth-gconf-tools.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../src/krb5-auth-gconf-tools.c' object='krb5-auth-gconf-tools.obj' libtool=no @AMDEPBACKSLASH@ +krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj: $(top_srcdir)/src/krb5-auth-gconf-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-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo -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` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/krb5-auth-gconf-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o krb5-auth-gconf-tools.obj `if test -f '../src/krb5-auth-gconf-tools.c'; then $(CYGPATH_W) '../src/krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/../src/krb5-auth-gconf-tools.c'; fi` +@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` mostlyclean-libtool: -rm -f *.lo @@ -610,6 +639,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-desktopDATA uninstall-pkgdataDATA + $(AM_CPPFLAGS) @INTLTOOL_DESKTOP_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/preferences/krb5-auth-dialog-preferences.c b/preferences/krb5-auth-dialog-preferences.c index ab463a0..c0d75c6 100644 --- a/preferences/krb5-auth-dialog-preferences.c +++ b/preferences/krb5-auth-dialog-preferences.c @@ -32,14 +32,13 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <glade/glade.h> #include "krb5-auth-gconf-tools.h" #define N_LISTENERS 8 typedef struct { - GladeXML *xml; + GtkBuilder *xml; GConfClient *client; GtkWidget *dialog; @@ -102,7 +101,7 @@ ka_preferences_dialog_setup_principal_entry (KaPreferencesDialog *dialog) { char *principal = NULL; - dialog->principal_entry = glade_xml_get_widget (dialog->xml, "principal_entry"); + dialog->principal_entry = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "principal_entry")); g_assert (dialog->principal_entry != NULL); if (!ka_gconf_get_string (dialog->client, KA_GCONF_KEY_PRINCIPAL, &principal)) @@ -173,7 +172,7 @@ ka_preferences_dialog_setup_pkuserid_entry (KaPreferencesDialog *dialog) { char *pkuserid = NULL; - dialog->pkuserid_entry = glade_xml_get_widget (dialog->xml, "pkuserid_entry"); + dialog->pkuserid_entry = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "pkuserid_entry")); g_assert (dialog->pkuserid_entry != NULL); if (!ka_gconf_get_string (dialog->client, KA_GCONF_KEY_PK_USERID, &pkuserid)) @@ -243,7 +242,7 @@ ka_preferences_dialog_setup_pkanchors_entry (KaPreferencesDialog *dialog) { char *pkanchors = NULL; - dialog->pkanchors_entry = glade_xml_get_widget (dialog->xml, "pkanchors_entry"); + dialog->pkanchors_entry = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "pkanchors_entry")); g_assert (dialog->pkanchors_entry != NULL); if (!ka_gconf_get_string (dialog->client, KA_GCONF_KEY_PK_ANCHORS, &pkanchors)) @@ -303,7 +302,7 @@ ka_preferences_dialog_setup_forwardable_toggle (KaPreferencesDialog *dialog) { gboolean forwardable; - dialog->forwardable_toggle = glade_xml_get_widget (dialog->xml, "forwardable_toggle"); + dialog->forwardable_toggle = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "forwardable_toggle")); g_assert (dialog->forwardable_toggle != NULL); forwardable = gconf_client_get_bool (dialog->client, KA_GCONF_KEY_FORWARDABLE, NULL); @@ -361,7 +360,7 @@ ka_preferences_dialog_setup_proxiable_toggle (KaPreferencesDialog *dialog) { gboolean proxiable; - dialog->proxiable_toggle = glade_xml_get_widget (dialog->xml, "proxiable_toggle"); + dialog->proxiable_toggle = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "proxiable_toggle")); g_assert (dialog->proxiable_toggle != NULL); proxiable = gconf_client_get_bool (dialog->client, KA_GCONF_KEY_PROXIABLE, NULL); @@ -419,7 +418,7 @@ ka_preferences_dialog_setup_renewable_toggle (KaPreferencesDialog *dialog) { gboolean renewable; - dialog->renewable_toggle = glade_xml_get_widget (dialog->xml, "renewable_toggle"); + dialog->renewable_toggle = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "renewable_toggle")); g_assert (dialog->renewable_toggle != NULL); renewable = gconf_client_get_bool (dialog->client, KA_GCONF_KEY_RENEWABLE, NULL); @@ -475,7 +474,7 @@ ka_preferences_dialog_setup_trayicon_toggle (KaPreferencesDialog *dialog) { gboolean trayicon; - dialog->trayicon_toggle = glade_xml_get_widget (dialog->xml, "trayicon_toggle"); + dialog->trayicon_toggle = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "trayicon_toggle")); g_assert (dialog->trayicon_toggle != NULL); trayicon = gconf_client_get_bool (dialog->client, KA_GCONF_KEY_SHOW_TRAYICON, NULL); @@ -532,7 +531,7 @@ ka_preferences_dialog_setup_prompt_mins_entry (KaPreferencesDialog *dialog) { gint prompt_mins; - dialog->prompt_mins_entry = glade_xml_get_widget (dialog->xml, "prompt_mins_entry"); + dialog->prompt_mins_entry = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "prompt_mins_entry")); g_assert (dialog->prompt_mins_entry != NULL); prompt_mins = gconf_client_get_int (dialog->client, KA_GCONF_KEY_PROMPT_MINS, NULL); @@ -568,9 +567,13 @@ ka_preferences_dialog_response (GtkWidget *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; @@ -607,10 +610,12 @@ ka_preferences_dialog_destroyed (GtkWidget *widget G_GNUC_UNUSED, static gboolean ka_preferences_dialog_init(KaPreferencesDialog* dialog) { - dialog->xml = glade_xml_new (KA_DATA_DIR G_DIR_SEPARATOR_S - PACKAGE "-preferences.glade", NULL, NULL); + dialog->xml = gtk_builder_new (); - dialog->dialog = glade_xml_get_widget (dialog->xml, "krb5_auth_dialog_prefs"); + g_assert(gtk_builder_add_from_file(dialog->xml, KA_DATA_DIR G_DIR_SEPARATOR_S + PACKAGE "-preferences.xml", NULL)); + + dialog->dialog = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "krb5_auth_dialog_prefs")); g_assert (dialog->dialog); g_signal_connect (dialog->dialog, "response", diff --git a/preferences/krb5-auth-dialog-preferences.glade b/preferences/krb5-auth-dialog-preferences.xml index 8e23b2f..5bb48bd 100644 --- a/preferences/krb5-auth-dialog-preferences.glade +++ b/preferences/krb5-auth-dialog-preferences.xml @@ -1,109 +1,113 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Tue Apr 14 22:22:46 2009 --> -<glade-interface> - <widget class="GtkDialog" id="krb5_auth_dialog_prefs"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="krb5_auth_dialog_prefs"> <property name="border_width">5</property> <property name="title" translatable="yes">Kerberos Authentication Configuration</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="window_position">center-on-parent</property> <property name="icon_name">gtk-dialog-authentication</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <property name="has_separator">False</property> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> + <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkNotebook" id="notebook1"> + <object class="GtkNotebook" id="notebook1"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="border_width">12</property> <property name="spacing">18</property> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label4"> + <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> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkImage" id="access"> + <object class="GtkImage" id="access"> <property name="visible">True</property> <property name="yalign">0</property> - <property name="icon_size">6</property> <property name="icon_name">gtk-dialog-authentication</property> - </widget> + <property name="icon-size">6</property> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox5"> + <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label6"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Kerberos principal:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox5"> + <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label8"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="label" translatable="yes"> </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="principal_entry"> + <object class="GtkEntry" id="principal_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkLabel" id="label7"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">PKINIT userid: </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -111,41 +115,42 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox6"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label9"> + <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="label" translatable="yes"> </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="pkuserid_entry"> + <object class="GtkEntry" id="pkuserid_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The principal's public/private/certificate identifier. Leave empty if not using PKINIT.</property> + <property name="tooltip_text" translatable="yes">The principal's public/private/certificate identifier. Leave empty if not using PKINIT.</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">PKINT anchors:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -153,122 +158,128 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox12"> + <object class="GtkHBox" id="hbox12"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label20"> + <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="label" translatable="yes"> </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="pkanchors_entry"> + <object class="GtkEntry" id="pkanchors_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Path to CA certificates used as trust anchors for PKINIT</property> + <property name="tooltip_text" translatable="yes">Path to CA certificates used as trust anchors for PKINIT</property> <property name="activates_default">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">5</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox3"> + <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label5"> + <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> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="yalign">0</property> - <property name="icon_size">6</property> <property name="icon_name">system-lock-screen</property> - </widget> + <property name="icon-size">6</property> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox4"> + <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label10"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="label" translatable="yes">Requested Kerberos tickets should be:</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label11"> + <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="label" translatable="yes"> </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="forwardable_toggle"> + <object class="GtkCheckButton" id="forwardable_toggle"> + <property name="label" translatable="yes">forwardable</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, request forwardable tickets</property> - <property name="label" translatable="yes">forwardable</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, request forwardable tickets</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -276,155 +287,159 @@ </packing> </child> <child> - <widget class="GtkHBox" id="hbox4"> + <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label12"> + <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="label" translatable="yes"> </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="renewable_toggle"> + <object class="GtkCheckButton" id="renewable_toggle"> + <property name="label" translatable="yes">renewable</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, request renewable tickets</property> - <property name="label" translatable="yes">renewable</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, request renewable tickets</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox11"> + <object class="GtkHBox" id="hbox11"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label19"> + <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="label" translatable="yes"> </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="proxiable_toggle"> + <object class="GtkCheckButton" id="proxiable_toggle"> + <property name="label" translatable="yes">proxiable</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, request proxiable tickets</property> - <property name="label" translatable="yes">proxiable</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, request proxiable tickets</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="tab"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes">Kerberos</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox9"> + <object class="GtkVBox" id="vbox9"> <property name="visible">True</property> <property name="border_width">12</property> <property name="spacing">18</property> <child> - <widget class="GtkVBox" id="vbox8"> + <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label17"> + <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> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox9"> + <object class="GtkHBox" id="hbox9"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkImage" id="image3"> + <object class="GtkImage" id="image3"> <property name="visible">True</property> <property name="yalign">0</property> <property name="stock">gtk-dialog-warning</property> - <property name="icon_size">6</property> - </widget> + <property name="icon-size">6</property> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox8"> + <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label14"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="label" translatable="yes"> </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="label15"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="label" translatable="yes">Warn</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -432,13 +447,13 @@ </packing> </child> <child> - <widget class="GtkSpinButton" id="prompt_mins_entry"> + <object class="GtkSpinButton" id="prompt_mins_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" 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">0 0 100 1 10 10</property> - </widget> + <property name="adjustment">adjustment1</property> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -446,175 +461,197 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label16"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="label" translatable="yes">minutes before expiry</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox10"> + <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label18"> + <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> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox10"> + <object class="GtkHBox" id="hbox10"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <widget class="GtkImage" id="image2"> + <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="stock">gtk-zoom-in</property> - <property name="icon_size">6</property> - </widget> + <property name="icon-size">6</property> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox7"> + <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> <child> - <widget class="GtkHBox" id="hbox7"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label13"> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="label" translatable="yes"> </property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="trayicon_toggle"> + <object class="GtkCheckButton" id="trayicon_toggle"> + <property name="label" translatable="yes">Show tray icon</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, display the tray icon in the status bar.</property> - <property name="label" translatable="yes">Show tray icon</property> - <property name="response_id">0</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="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label2"> + <child type="tab"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="label" translatable="yes">Applet</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkHButtonBox" id="dialog-action_area1"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> - <widget class="GtkButton" id="button2"> + <object class="GtkButton" id="button2"> + <property name="label" translatable="yes">gtk-help</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="label" translatable="yes">gtk-help</property> <property name="use_stock">True</property> - <property name="response_id">-11</property> - </widget> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="button1"> + <object class="GtkButton" id="button1"> + <property name="label" translatable="yes">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="label" translatable="yes">gtk-close</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - </widget> + </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + <action-widgets> + <action-widget response="-11">button2</action-widget> + <action-widget response="0">button1</action-widget> + </action-widgets> + </object> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> +</interface> |