s/g_copy_strings/g_strconcat/

svn path=/trunk/; revision=566

9 files changed, 20 insertions, 14 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4d3f0404ca..44e7d82f62 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-30  Jeff Garzik  <jgarzik@pobox.com>
+
+	* gncal/calendar.c, gncal/gnome-cal.c, gncal/main.c,
+	  gncal/quick-view.c:
+	s/g_copy_strings/g_strconcat/
+
 1998-12-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	Rewrote the old and broken alarm system.  It never actually
diff --git a/calendar/calendar.c b/calendar/calendar.c
index e510f1f1b1..5fa7035f3a 100644
--- a/calendar/calendar.c
+++ b/calendar/calendar.c
@@ -339,7 +339,7 @@ calendar_save (Calendar *cal, char *fname)
 	}
 
 	if (g_file_exists (fname)){
-		char *backup_name = g_copy_strings (fname, "~", NULL);
+		char *backup_name = g_strconcat (fname, "~", NULL);
 
 		if (g_file_exists (backup_name)){
 			unlink (backup_name);
diff --git a/calendar/gnome-cal.c b/calendar/gnome-cal.c
index 5403fd3a94..51cda3472f 100644
--- a/calendar/gnome-cal.c
+++ b/calendar/gnome-cal.c
@@ -188,7 +188,7 @@ gnome_calendar_new (char *title)
 	gcal = GNOME_CALENDAR (retval);
 	
 	app->name = g_strdup ("calendar");
-	app->prefix = g_copy_strings ("/", app->name, "/", NULL);
+	app->prefix = g_strconcat ("/", app->name, "/", NULL);
 	
 	gtk_window_set_title(GTK_WINDOW(retval), title);
 
@@ -329,7 +329,7 @@ mail_notify (char *mail_address, char *text, time_t app_time)
 		       mail_address, NULL);
 		_exit (127);
 	}
-	command = g_copy_strings ("To: ", mail_address, "\n",
+	command = g_strconcat ("To: ", mail_address, "\n",
 				  "Subject: ", _("Reminder of your appointment at "),
 				  ctime (&app_time), "\n\n", text, "\n", NULL);
 	write (p [1], command, strlen (command));
@@ -365,7 +365,7 @@ calendar_notify (time_t time, CalendarAlarm *which, void *data)
 		GtkWidget *w;
 		char *msg;
 
-		msg = g_copy_strings (_("Reminder of your appointment at "),
+		msg = g_strconcat (_("Reminder of your appointment at "),
 					ctime (&app), "`",
 					ico->summary, "'", NULL);
 
@@ -395,7 +395,7 @@ calendar_notify (time_t time, CalendarAlarm *which, void *data)
 		GtkWidget *w;
 		char *msg;
 
-		msg = g_copy_strings (_("Reminder of your appointment at "),
+		msg = g_strconcat (_("Reminder of your appointment at "),
 					ctime (&app), "`",
 					ico->summary, "'", NULL);
 		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, "Ok", NULL);
diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c
index e510f1f1b1..5fa7035f3a 100644
--- a/calendar/gui/calendar.c
+++ b/calendar/gui/calendar.c
@@ -339,7 +339,7 @@ calendar_save (Calendar *cal, char *fname)
 	}
 
 	if (g_file_exists (fname)){
-		char *backup_name = g_copy_strings (fname, "~", NULL);
+		char *backup_name = g_strconcat (fname, "~", NULL);
 
 		if (g_file_exists (backup_name)){
 			unlink (backup_name);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 5403fd3a94..51cda3472f 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -188,7 +188,7 @@ gnome_calendar_new (char *title)
 	gcal = GNOME_CALENDAR (retval);
 	
 	app->name = g_strdup ("calendar");
-	app->prefix = g_copy_strings ("/", app->name, "/", NULL);
+	app->prefix = g_strconcat ("/", app->name, "/", NULL);
 	
 	gtk_window_set_title(GTK_WINDOW(retval), title);
 
@@ -329,7 +329,7 @@ mail_notify (char *mail_address, char *text, time_t app_time)
 		       mail_address, NULL);
 		_exit (127);
 	}
-	command = g_copy_strings ("To: ", mail_address, "\n",
+	command = g_strconcat ("To: ", mail_address, "\n",
 				  "Subject: ", _("Reminder of your appointment at "),
 				  ctime (&app_time), "\n\n", text, "\n", NULL);
 	write (p [1], command, strlen (command));
@@ -365,7 +365,7 @@ calendar_notify (time_t time, CalendarAlarm *which, void *data)
 		GtkWidget *w;
 		char *msg;
 
-		msg = g_copy_strings (_("Reminder of your appointment at "),
+		msg = g_strconcat (_("Reminder of your appointment at "),
 					ctime (&app), "`",
 					ico->summary, "'", NULL);
 
@@ -395,7 +395,7 @@ calendar_notify (time_t time, CalendarAlarm *which, void *data)
 		GtkWidget *w;
 		char *msg;
 
-		msg = g_copy_strings (_("Reminder of your appointment at "),
+		msg = g_strconcat (_("Reminder of your appointment at "),
 					ctime (&app), "`",
 					ico->summary, "'", NULL);
 		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, "Ok", NULL);
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index d6d7d71bb4..2c4660020b 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -143,7 +143,7 @@ init_calendar (void)
 
 	for (i = 0; i < COLOR_PROP_LAST; i++) {
 		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);
-		str = g_copy_strings (color_props[i].key, "=", cspec, NULL);
+		str = g_strconcat (color_props[i].key, "=", cspec, NULL);
 
 		color = gnome_config_get_string (str);
 		parse_color_spec (color, &color_props[i].r, &color_props[i].g, &color_props[i].b);
diff --git a/calendar/gui/quick-view.c b/calendar/gui/quick-view.c
index 364ea8f691..ce48f4cf6e 100644
--- a/calendar/gui/quick-view.c
+++ b/calendar/gui/quick-view.c
@@ -103,7 +103,7 @@ create_items_for_event (QuickView *qv, CalendarObject *co, double *y, double *ma
 		strftime (end, sizeof (end), "%H:%M", &end_tm);
 	}
 
-	str = g_copy_strings (start, " - ", end, " ", co->ico->summary, NULL);
+	str = g_strconcat (start, " - ", end, " ", co->ico->summary, NULL);
 
 	item = gnome_canvas_item_new (gnome_canvas_root (canvas),
 				      gnome_canvas_text_get_type (),
diff --git a/calendar/main.c b/calendar/main.c
index d6d7d71bb4..2c4660020b 100644
--- a/calendar/main.c
+++ b/calendar/main.c
@@ -143,7 +143,7 @@ init_calendar (void)
 
 	for (i = 0; i < COLOR_PROP_LAST; i++) {
 		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);
-		str = g_copy_strings (color_props[i].key, "=", cspec, NULL);
+		str = g_strconcat (color_props[i].key, "=", cspec, NULL);
 
 		color = gnome_config_get_string (str);
 		parse_color_spec (color, &color_props[i].r, &color_props[i].g, &color_props[i].b);
diff --git a/calendar/quick-view.c b/calendar/quick-view.c
index 364ea8f691..ce48f4cf6e 100644
--- a/calendar/quick-view.c
+++ b/calendar/quick-view.c
@@ -103,7 +103,7 @@ create_items_for_event (QuickView *qv, CalendarObject *co, double *y, double *ma
 		strftime (end, sizeof (end), "%H:%M", &end_tm);
 	}
 
-	str = g_copy_strings (start, " - ", end, " ", co->ico->summary, NULL);
+	str = g_strconcat (start, " - ", end, " ", co->ico->summary, NULL);
 
 	item = gnome_canvas_item_new (gnome_canvas_root (canvas),
 				      gnome_canvas_text_get_type (),