From cf9750cbcc1e5b1210605d543447372dabb93950 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Wed, 8 Feb 2012 15:08:23 -0500
Subject: [PATCH] Source code changes
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Includes following change:

  Date: 2012-01-22
  From: Daniel Altmann <daniel.prvt@t-online.de>

  In "add_edit.c" the "changed" signal, instead of "key_released", makes
  copy/paste work. Still releasing a key does what it should.

  > 227     g_signal_connect (G_OBJECT(e_entry[FIRST_NAME]), "changed",
    228                         G_CALLBACK(gui_add_rkey), NULL);
    ..
    245     e_entry[LAST_NAME] = gtk_entry_new();
  > 246     g_signal_connect (G_OBJECT(e_entry[LAST_NAME]), "changed",

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 src/add_edit.c |   21 +++++---
 src/data.c     |    7 ++-
 src/data.h     |   22 ++++----
 src/export.c   |    4 +-
 src/main.c     |    4 ++
 src/prefs.c    |  151 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 src/prefs.h    |    2 +
 7 files changed, 178 insertions(+), 33 deletions(-)

diff --git a/src/add_edit.c b/src/add_edit.c
index 2f3bcd5..0c49a11 100644
--- a/src/add_edit.c
+++ b/src/add_edit.c
@@ -100,18 +100,23 @@ GtkTextIter a_iter, b_iter;
 			size_notes);
 
 
-	if(strlen(rec_entry.first_name) || strlen(rec_entry.last_name)) {
+	if(strlen(rec_entry.first_name) && strlen(rec_entry.last_name)) {
+		if ( find_record(rec_entry.first_name, rec_entry.last_name) >= 0 ) {
+			gui_show_status(_("ERROR: Same first name and last name already exists"));
 
-		data_add_record(&rec_entry);
+		} else {
 
-		gui_display_records_list();
-		gui_update_records_list((gchar *)gtk_entry_get_text(GTK_ENTRY(find_entry)));
+			data_add_record(&rec_entry);
 
-		gui_show_status(_("Contact added sucessfully."));
+			gui_display_records_list();
+			gui_update_records_list((gchar *)gtk_entry_get_text(GTK_ENTRY(find_entry)));
+
+			gui_show_status(_("Contact added successfully."));
+		}
 
 	} else {
 
-		gui_show_status(_("Contact needs first or last name!"));
+		gui_show_status(_("Contact needs first and last name!"));
 
 	}
 
@@ -219,7 +224,7 @@ GtkSizeGroup *sg_label, *sg_entry;
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 
 	e_entry[FIRST_NAME] = gtk_entry_new();
-	g_signal_connect (G_OBJECT(e_entry[FIRST_NAME]), "key_release_event",
+	g_signal_connect (G_OBJECT(e_entry[FIRST_NAME]), "changed",
 						G_CALLBACK(gui_add_rkey), NULL);
 	gtk_entry_set_max_length(GTK_ENTRY(e_entry[FIRST_NAME]), size_name-1);
 	gtk_widget_show (e_entry[FIRST_NAME]);
@@ -237,7 +242,7 @@ GtkSizeGroup *sg_label, *sg_entry;
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 
 	e_entry[LAST_NAME] = gtk_entry_new();
-	g_signal_connect (G_OBJECT(e_entry[LAST_NAME]), "key_release_event",
+	g_signal_connect (G_OBJECT(e_entry[LAST_NAME]), "changed",
 						G_CALLBACK(gui_add_rkey), NULL);
 	gtk_entry_set_max_length(GTK_ENTRY(e_entry[LAST_NAME]), size_name-1);
 	gtk_widget_show (e_entry[LAST_NAME]);
diff --git a/src/data.c b/src/data.c
index 9f83e4b..0d456a7 100644
--- a/src/data.c
+++ b/src/data.c
@@ -178,7 +178,7 @@ gint i;
 
 	records = 0;
 
-	if((doc = xmlParseFile(get_data_filename(".clay", DATAFILE)))) {
+	if((doc = xmlParseFile(get_data_filename(DATADIR, DATAFILE)))) {
 
 		if(!(cur = xmlDocGetRootElement(doc))) {
 			g_print("WARNING: datafile is empty.\n");
@@ -268,7 +268,10 @@ gint i, j;
 	xmlSetProp(doc->xmlRootNode, "records", c);
 	xmlAddChild(doc->xmlRootNode, xmlNewText("\n"));
 
-	xmlSaveFile(get_data_filename(".clay", DATAFILE), doc);
+	gchar *file = get_data_filename(DATADIR, DATAFILE);
+
+	xmlSaveFormatFileEnc(file, doc, "utf-8", 1);
+	/* xmlSaveFile(file, doc); */
 	xmlFreeDoc(doc);
 
 	return 0;
diff --git a/src/data.h b/src/data.h
index afb8077..b0e122d 100644
--- a/src/data.h
+++ b/src/data.h
@@ -22,17 +22,17 @@
 
 #define		DATAFILE		"dlume-data.xml"
 
-#define		size_name			25
-#define		size_address		50
-#define		size_city			25
-#define		size_country		25
-#define		size_state			25
-#define		size_post_code		15
-#define		size_phone			45
-#define		size_email			40
-#define		size_url			50
-#define		size_birthday		25
-#define		size_notes			4096
+#define		size_name		225
+#define		size_address		250
+#define		size_city		225
+#define		size_country		225
+#define		size_state		225
+#define		size_post_code		215
+#define		size_phone		245
+#define		size_email		240
+#define		size_url		250
+#define		size_birthday		225
+#define		size_notes		4096
 
 #define		nfields				30		/* number of fields */
 
diff --git a/src/export.c b/src/export.c
index bd2ad3b..3567d2e 100644
--- a/src/export.c
+++ b/src/export.c
@@ -503,8 +503,8 @@ gchar *html_head[] = {
 			e = (config.selected_fields >> k) & 1;
 
 			if(e) {
-				fprintf(filehandle, "\t<th>");
-				fprintf(filehandle, html_head[k]);
+			        fprintf(filehandle, "\t<th>");
+				fprintf(filehandle, "%s", html_head[k]);
 				fprintf(filehandle, "</th>\n");
 			}
 		}
diff --git a/src/main.c b/src/main.c
index 533ff3b..09776b2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,6 +33,9 @@ int main(int argc, char **argv)
 {
 	read_config ();
 
+        char *file = s_getfilename_config();
+	s_flock(file);
+
 	data_init ();
 	data_read ();
 
@@ -53,6 +56,7 @@ int main(int argc, char **argv)
 	data_close();
 
 	write_config ();
+	s_funlock(file);
 
 	return 0;
 }
diff --git a/src/prefs.c b/src/prefs.c
index 991f603..4cebf4f 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -32,20 +32,84 @@ struct dlumeprefs config;
 
 FILE *prefs_filehandle;
 
+
 /*---------------------------------------------------------------------------*/
 
-gchar* s_getdir_config (void)
+void exit_with_message (const char *str)
 {
-static gchar cfgdir[MAX_PATH];
-struct stat cfg;
+    fprintf(stderr, "%s", str);
+
+    struct stat info;
+
+    /* old way; disabled now */
+    if ( 0 && stat("/usr/bin/xmessage", &info) == 0 )
+    {
+	execl("/usr/bin/xmessage", "dlume error", str, NULL);
+    }
+
+    /* http://developer.gnome.org/doc/API/2.4/gtk/GtkMessageDialog.html */
+    gtk_init( NULL, NULL);
+
+    GtkWindowType type = GTK_WINDOW_TOPLEVEL;
+    GtkWidget *parent = gtk_window_new(type);
+    GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(parent),
+                                                GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                GTK_MESSAGE_ERROR,
+                                                GTK_BUTTONS_CLOSE,
+                                                "%s",
+                                                str);
+
+    /* http://developer.gnome.org/doc/API/2.4/gtk/GtkDialog.html#gtk-dialog-run */
+    (void) gtk_dialog_run( GTK_DIALOG(dialog));
+    gtk_widget_destroy( dialog);
+
+
+    /*
+    gtk_widget_show( info_dialog);
+
+    g_signal_connect( G_OBJECT(info_dialog),
+                      "response",
+                      G_CALLBACK(gtk_widget_destroy),
+                      NULL);
+    */
 
-	s_strcpy (cfgdir, getenv ("HOME"), MAX_PATH);
-	s_strcat (cfgdir, "/.clay", MAX_PATH);
 
-	if(stat (cfgdir, &cfg) < 0)
-		mkdir (cfgdir, S_IRUSR | S_IWUSR | S_IXUSR);
+    /*  The execl may fail due to DISPLAY not set. */
+    exit(1);
+}
+
+/*---------------------------------------------------------------------------*/
 
-	return cfgdir;
+gchar* s_getdir_config (void)
+{
+       static gchar cfgdir[MAX_PATH];
+       gchar oldcfgdir[MAX_PATH];
+       struct stat cfg;
+
+       s_strcpy( oldcfgdir, getenv ("HOME"), MAX_PATH);
+       s_strcat( oldcfgdir, "/", MAX_PATH);
+       s_strcat( oldcfgdir, ".clay", MAX_PATH);
+
+       s_strcpy( cfgdir, getenv ("HOME"), MAX_PATH);
+       s_strcat( cfgdir, "/", MAX_PATH);
+       s_strcat( cfgdir, DATADIR, MAX_PATH);
+
+       if ( stat(oldcfgdir, &cfg) == 0 )
+       {
+	   char str[2000];
+	   sprintf(str,
+		   "[FATAL] dlume: Old config found. Please upgrade "
+                   "by running command: mv %s %s\n",
+		   oldcfgdir,
+		   cfgdir);
+
+	   exit_with_message(str);
+       }
+
+       if ( stat(cfgdir, &cfg) < 0 )
+	   mkdir (cfgdir, S_IRUSR | S_IWUSR | S_IXUSR);
+
+       return cfgdir;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -76,6 +140,72 @@ static gchar filename[MAX_PATH];
 
 /*---------------------------------------------------------------------------*/
 
+void s_funlock (gchar *filename)
+{
+	int  MAX     = 2000;
+	char lock[MAX];
+
+	strcpy( lock, filename);
+	s_strcpy( lock, filename, MAX);
+	s_strcat( lock, ".lock", MAX);
+
+	if ( !access(lock, 0) )
+	{
+	    if ( unlink(lock) )
+	    {
+		char str[MAX * 2];
+
+		sprintf(str,
+		   "[FATAL] dlume: Cannot remove lock: %s\n",
+		   lock);
+
+		exit_with_message(str);
+	    }
+	}
+}
+
+void s_flock (gchar *filename)
+{
+	FILE *handle = NULL;
+	int  MAX     = 2000;
+	pid_t pid    = getpid();
+
+	char lock[MAX];
+
+	strcpy( lock, filename);
+	s_strcpy( lock, filename, MAX);
+	s_strcat( lock, ".lock", MAX);
+
+	if ( !access(lock, 0) )
+	{
+	   char str[MAX * 2];
+
+	   sprintf(str,
+		   "[FATAL] dlume: Another process has locked the database: %s\n",
+		   lock);
+
+	   exit_with_message(str);
+	}
+
+	handle = fopen(lock, "wb");
+
+	if ( handle == NULL )
+	{
+	   char str[MAX * 2];
+
+	   sprintf(str,
+		   "[FATAL] dlume: Cannot create lock: %s\n",
+		   lock);
+
+	   exit_with_message(str);
+	}
+
+	fprintf( handle, "%lu\n", (unsigned long) pid);
+	fclose(handle);
+}
+
+/*---------------------------------------------------------------------------*/
+
 void* s_prefs_openfile (gchar *filename, gint openmode)
 {
 	prefs_filehandle = NULL;
@@ -126,7 +256,7 @@ gchar text[MAX_LINE_LEN];
 
 	s_strcpy (text, "# ", MAX_LINE_LEN);
 	s_strcat (text, comment, MAX_LINE_LEN);
-	fprintf (prefs_filehandle, text);
+	fprintf (prefs_filehandle, "%s", text);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -361,8 +491,9 @@ void read_config (void)
 
 void write_config(void)
 {
+        char *file = s_getfilename_config();
 
-	if (s_prefs_openfile (s_getfilename_config (), P_WRITE)) {
+	if (s_prefs_openfile (file, P_WRITE)) {
 
 		s_prefs_put_int ("window_pos_x", config.window_x);
 		s_prefs_put_int ("window_pos_y", config.window_y);
diff --git a/src/prefs.h b/src/prefs.h
index 58101ad..bb9fb41 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -22,6 +22,8 @@
 
 #include <gtk/gtk.h>
 
+#define DATADIR                 ".dlume"
+
 #define config_filename 	"dlume"
 #define config_a_filename 	"dlume-accels"
 
-- 
1.7.9