diff -Naur loadapplet-aw1/configure.ac loadapplet-aw2/configure.ac --- loadapplet-aw1/configure.ac 2006-02-17 22:59:39.000000000 +0100 +++ loadapplet-aw2/configure.ac 2006-02-25 08:33:32.000000000 +0100 @@ -42,6 +42,10 @@ AC_SUBST(HILDON_LIBS) AC_SUBST(HILDON_CFLAGS) +PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.4) +AC_SUBST(GCONF_LIBS) +AC_SUBST(GCONF_CFLAGS) + ALL_LINGUAS="de_DE en_GB en_US es_ES es_MX fi_FI fr_CA fr_FR it_IT pt_BR ru_RU" AC_SUBST(ALL_LINGUAS) diff -Naur loadapplet-aw1/load-plugin.c loadapplet-aw2/load-plugin.c --- loadapplet-aw1/load-plugin.c 2006-02-25 08:19:44.000000000 +0100 +++ loadapplet-aw2/load-plugin.c 2006-02-25 08:26:38.000000000 +0100 @@ -41,6 +41,10 @@ #include #include +/* Application settings */ +#include +#include + #include #include #include @@ -116,6 +120,7 @@ gboolean include_user = TRUE; gboolean include_io = TRUE; +GConfClient *gc_client; /* Hildon Status Bar plugin API prototypes */ void *load_initialize(HildonStatusBarItem *item, GtkWidget **button); @@ -423,6 +428,11 @@ if (sshotfilename) g_free(sshotfilename); sshotfilename = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry_filename))); screenshot_delay = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sb_seconds)); + /* make settings persistent via gconf */ + gconf_client_set_string(gc_client, "/apps/maemo/loadapplet/swapname", swapname, NULL); + gconf_client_set_string(gc_client, "/apps/maemo/loadapplet/sshotfilename", sshotfilename, NULL); + gconf_client_set_int(gc_client, "/apps/maemo/loadapplet/screenshot_delay", screenshot_delay, NULL); + gtk_widget_destroy(dialog); break; default: @@ -727,7 +737,14 @@ /* Screenshot stuff too */ root_window = gdk_get_default_root_window (); gdk_drawable_get_size (root_window, &width, &height); - sshotfilename = g_strdup(SSHOT_DEFAULT_NAME); + + /* retrieve stored settings from gconf */ + g_type_init(); + gc_client = gconf_client_get_default(); + sshotfilename = gconf_client_get_string(gc_client, "/apps/maemo/loadapplet/sshotfilename", NULL); + screenshot_delay = gconf_client_get_int(gc_client, "/apps/maemo/loadapplet/screenshot_delay", NULL); + swapname = gconf_client_get_string(gc_client, "/apps/maemo/loadapplet/swapname", NULL); + return info; } diff -Naur loadapplet-aw1/Makefile.am loadapplet-aw2/Makefile.am --- loadapplet-aw1/Makefile.am 2005-11-24 17:24:11.000000000 +0100 +++ loadapplet-aw2/Makefile.am 2006-02-25 08:35:11.000000000 +0100 @@ -1,6 +1,6 @@ SUBDIRS = -INCLUDES = $(STATUSBARLIB_CFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS) $(DBUS_CFLAGS)\ +INCLUDES = $(GCONF_CFLAGS) $(STATUSBARLIB_CFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS) $(DBUS_CFLAGS)\ -DPREFIX=\"$(prefix)\" -DLOCALEDIR=\"$(localedir)\" AM_LDFLAGS = -module -avoid-version @@ -19,7 +19,7 @@ $(icon_DATA) hildonstatusbarplugin_LTLIBRARIES = libload.la -libload_la_LIBADD = $(STATUSBARLIB_LIBS) $(GTK_LIBS) $(HILDON_LIBS) +libload_la_LIBADD = $(STATUSBARLIB_LIBS) $(GTK_LIBS) $(HILDON_LIBS) $(GCONF_LIBS) libload_la_SOURCES = load-plugin.c deb: dist