diary r46 - in trunk: . data src src/links

[pwithnall svn gnome org]

Author: pwithnall
Date: Sun Jun 22 14:17:12 2008
New Revision: 46
URL: http://svn.gnome.org/viewvc/diary?rev=46&view=rev

Log:
2008-06-22  Philip Withnall  <philip tecnocode co uk>

	* NEWS: Fix a typo.
	* data/diary.ui: Make the search dialogue non-modal.
	* configure.ac:
	* src/interface.c:
	* src/links/file.c:
	* src/main-window.c:
	* src/main.c: (diary_quit_real), (main):
	* src/main.h:
	* src/storage-manager.c: Fix the non-encryption build.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/data/diary.ui
   trunk/src/interface.c
   trunk/src/links/file.c
   trunk/src/main-window.c
   trunk/src/main.c
   trunk/src/main.h
   trunk/src/storage-manager.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Jun 22 14:17:12 2008
@@ -6,7 +6,7 @@
 * Add an icon by Jakub Szypulka and a desktop file
 * Improvements to encryption support
 * Add a French translation by Jean-FranÃois Martin
-* Fix a crasher bug if requesting statistics for a database with no entries.
+* Fix a crasher bug if requesting statistics for a database with no entries
 
 0.2:
 * Relicensed from GPLv2 to GPLv3

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jun 22 14:17:12 2008
@@ -53,11 +53,13 @@
 
 AM_PROG_LIBTOOL
 
-PKG_CHECK_MODULES(STANDARD, glib-2.0 gtk+-2.0 >= 2.12 gmodule-2.0 gio-2.0 sqlite3 gtkspell-2.0 gconf-2.0 cairo)
+PKG_CHECK_MODULES(STANDARD, glib-2.0 gtk+-2.0 >= 2.12 gmodule-2.0 gio-2.0 sqlite3 gtkspell-2.0 cairo)
 AC_SUBST(STANDARD_CFLAGS)
 AC_SUBST(STANDARD_LIBS)
 
 if test $encryption = "true"; then
+	PKG_CHECK_MODULES(ENCRYPTION, gconf-2.0)
+
 	dnl Check for GPGME, which doesn't provide a pkgconfig file
 	dnl This code courtesy of seahorse
 	min_gpgme_version=1.0.0
@@ -88,8 +90,8 @@
 	fi
 
 	if test $ok = "yes"; then
-		ENCRYPTION_CFLAGS=`$GPGME_CONFIG --cflags`
-		ENCRYPTION_LIBS=`$GPGME_CONFIG --libs`
+		ENCRYPTION_CFLAGS="$ENCRYPTION_CFLAGS `$GPGME_CONFIG --cflags`"
+		ENCRYPTION_LIBS="$ENCRYPTION_LIBS `$GPGME_CONFIG --libs`"
 		AC_MSG_RESULT(yes)
 	else
 		AC_MSG_ERROR(GPGME $min_gpgme_version or later needed)

Modified: trunk/data/diary.ui
==============================================================================
--- trunk/data/diary.ui	(original)
+++ trunk/data/diary.ui	Sun Jun 22 14:17:12 2008
@@ -418,6 +418,7 @@
 	<object class="GtkDialog" id="dry_search_dialog">
 		<property name="title" translatable="yes">Search</property>
 		<property name="has-separator">False</property>
+		<property name="modal">False</property>
 		<signal name="destroy" handler="sd_destroy_cb"/>
 		<child internal-child="vbox">
 			<object class="GtkVBox" id="vbox2">

Modified: trunk/src/interface.c
==============================================================================
--- trunk/src/interface.c	(original)
+++ trunk/src/interface.c	Sun Jun 22 14:17:12 2008
@@ -17,10 +17,10 @@
  * along with Diary.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "config.h"
 #include "main.h"
 #include "main-window.h"
 #include "add-link-dialog.h"

Modified: trunk/src/links/file.c
==============================================================================
--- trunk/src/links/file.c	(original)
+++ trunk/src/links/file.c	Sun Jun 22 14:17:12 2008
@@ -25,6 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <gio/gio.h>
 
 #include "../interface.h"
 #include "../main.h"

Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c	(original)
+++ trunk/src/main-window.c	Sun Jun 22 14:17:12 2008
@@ -17,11 +17,11 @@
  * along with Diary.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gtkspell/gtkspell.h>
 
-#include "config.h"
 #include "main.h"
 #include "storage-manager.h"
 #include "link.h"

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Sun Jun 22 14:17:12 2008
@@ -21,7 +21,9 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#ifdef ENABLE_ENCRYPTION
 #include <gconf/gconf.h>
+#endif /* ENABLE_ENCRYPTION */
 
 #include "main.h"
 #include "storage-manager.h"
@@ -45,7 +47,9 @@
 diary_quit_real (void)
 {
 	g_object_unref (diary->storage_manager);
+#ifdef ENABLE_ENCRYPTION
 	g_object_unref (diary->gconf_client);
+#endif /* ENABLE_ENCRYPTION */
 	g_free (diary);
 
 	if (gtk_main_level () > 0)
@@ -104,8 +108,10 @@
 	diary->debug = debug;
 	diary->quitting = FALSE;
 
+#ifdef ENABLE_ENCRYPTION
 	/* Open GConf */
 	diary->gconf_client = gconf_client_get_default ();
+#endif /* ENABLE_ENCRYPTION */
 
 	/* Open the DB */
 	db_filename = g_build_filename (g_get_user_data_dir (), "diary.db", NULL);

Modified: trunk/src/main.h
==============================================================================
--- trunk/src/main.h	(original)
+++ trunk/src/main.h	Sun Jun 22 14:17:12 2008
@@ -17,9 +17,12 @@
  * along with Diary.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <gtk/gtk.h>
 #include <glib.h>
+#ifdef ENABLE_ENCRYPTION
 #include <gconf/gconf-client.h>
+#endif /* ENABLE_ENCRYPTION */
 
 #include "storage-manager.h"
 
@@ -30,7 +33,9 @@
 
 typedef struct {
 	DiaryStorageManager *storage_manager;
+#ifdef ENABLE_ENCRYPTION
 	GConfClient *gconf_client;
+#endif /* ENABLE_ENCRYPTION */
 
 	GtkWidget *main_window;
 	GtkTextView *entry_view;

Modified: trunk/src/storage-manager.c
==============================================================================
--- trunk/src/storage-manager.c	(original)
+++ trunk/src/storage-manager.c	Sun Jun 22 14:17:12 2008
@@ -17,20 +17,22 @@
  * along with Diary.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <sqlite3.h>
 #include <stdlib.h>
-#include <gpgme.h>
 #include <sys/stat.h>
 #include <string.h>
+#ifdef ENABLE_ENCRYPTION
+#include <gpgme.h>
+#endif /* ENABLE_ENCRYPTION */
 
 #include "main.h"
 #include "interface.h"
 #include "link.h"
 #include "storage-manager.h"
-#include "config.h"
 
 #define ENCRYPTION_KEY_GCONF_PATH "/desktop/pgp/default_key"