changeset 15372:f79e0f4df793

Add a PIDGIN_NAME macro defined to "Pidgin," and converted a few places within gtk/ to use it. There's a lot of instances of "Gaim" strings in libpurple which would be better of not referring to anything at all.

--- a/gaim.desktop.in	Fri Jan 19 04:14:46 2007 +0000
+++ b/gaim.desktop.in	Sat Jan 20 00:38:22 2007 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Gaim Internet Messenger
+_Name=Pidgin Internet Messenger
 _GenericName=Internet Messenger
 _Comment=Send instant messages over multiple protocols
 Exec=gaim

--- a/gtk/gtkdialogs.c	Fri Jan 19 04:14:46 2007 +0000
+++ b/gtk/gtkdialogs.c	Sat Jan 20 00:38:22 2007 +0000
@@ -298,7 +298,7 @@
 	}
 
 	GAIM_DIALOG(about);
-	gtk_window_set_title(GTK_WINDOW(about), _("About Gaim"));
+	gtk_window_set_title(GTK_WINDOW(about), _("About " PIDGIN_NAME));
 	gtk_window_set_role(GTK_WINDOW(about), "about");
 	gtk_window_set_resizable(GTK_WINDOW(about), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(about), 340, 450);
@@ -322,7 +322,7 @@
 	gdk_pixbuf_unref(pixbuf);
 	/* Insert the logo */
 	obj = gtk_widget_get_accessible(logo);
-	atk_object_set_description(obj, "Gaim " VERSION);
+	atk_object_set_description(obj, PIDGIN_NAME " " VERSION);
 	gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0);
 
 	frame = gaim_gtk_create_imhtml(FALSE, &text, NULL, NULL);
@@ -332,7 +332,7 @@
 	str = g_string_sized_new(4096);
 
 	g_string_append(str,
-		_("Gaim is a modular messaging client capable of using "
+		_(PIDGIN_NAME " is a modular messaging client capable of using "
 		  "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, "
 		  "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
 		  "Gadu-Gadu, and QQ all at once.  "
@@ -340,7 +340,7 @@
 		  "You may modify and redistribute the program under "
 		  "the terms of the GPL (version 2 or later).  A copy of the GPL is "
 		  "contained in the 'COPYING' file distributed with Gaim.  "
-		  "Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
+		  PIDGIN_NAME " is copyrighted by its contributors.  See the 'COPYRIGHT' "
 		  "file for the complete list of contributors.  We provide no "
 		  "warranty for this program.<BR><BR>"));
 
@@ -469,9 +469,9 @@
 #endif
 
 #ifdef HAVE_SSL
-	g_string_append(str, "  <b>SSL:</b> Gaim was compiled with SSL support.<br/>");
+	g_string_append(str, "  <b>SSL:</b> " PIDGIN_NAME " was compiled with SSL support.<br/>");
 #else
-	g_string_append(str, "  <b>SSL:</b> Gaim was <b><i>NOT</i></b> compiled with any SSL support!<br/>");
+	g_string_append(str, "  <b>SSL:</b> " PIDGIN_NAME " was <b><i>NOT</i></b> compiled with any SSL support!<br/>");
 #endif
 
 /* This might be useful elsewhere too, but it is particularly useful for

--- a/gtk/gtkgaim.h	Fri Jan 19 04:14:46 2007 +0000
+++ b/gtk/gtkgaim.h	Sat Jan 20 00:38:22 2007 +0000
@@ -37,6 +37,11 @@
 #endif
 
 /**
+ * Our user-readable name
+ */
+#define PIDGIN_NAME "Pidgin" 
+
+/**
  * Our UI's identifier.
  */
 #define GAIM_GTK_UI "gtk-gaim"
@@ -44,7 +49,7 @@
 #ifndef _WIN32
 # define GAIM_ALERT_TITLE ""
 #else
-# define GAIM_ALERT_TITLE "Gaim"
+# define GAIM_ALERT_TITLE PIDGIN_NAME 
 #endif
 
 /*

--- a/gtk/gtkmain.c	Fri Jan 19 04:14:46 2007 +0000
+++ b/gtk/gtkmain.c	Sat Jan 20 00:38:22 2007 +0000
@@ -341,9 +341,9 @@
 	char *text;
 
 	if (terse) {
-		text = g_strdup_printf(_("Gaim %s. Try `%s -h' for more information.\n"), VERSION, name);
+		text = g_strdup_printf(_(PIDGIN_NAME " %s. Try `%s -h' for more information.\n"), VERSION, name);
 	} else {
-		text = g_strdup_printf(_("Gaim %s\n"
+		text = g_strdup_printf(_(PIDGIN_NAME " %s\n"
 		       "Usage: %s [OPTION]...\n\n"
 		       "  -c, --config=DIR    use DIR for config files\n"
 		       "  -d, --debug         print debugging messages to stdout\n"
@@ -525,7 +525,7 @@
 #ifndef DEBUG
 		/* We translate this here in case the crash breaks gettext. */
 		segfault_message_tmp = g_strdup_printf(_(
-			"Gaim has segfaulted and attempted to dump a core file.\n"
+			PIDGIN_NAME " has segfaulted and attempted to dump a core file.\n"
 			"This is a bug in the software and has happened through\n"
 			"no fault of your own.\n\n"
 			"If you can reproduce the crash, please notify the gaim\n"
@@ -654,7 +654,7 @@
 	}
 	/* show version message */
 	if (opt_version) {
-		printf("Gaim %s\n", VERSION);
+		printf(PIDGIN_NAME " %s\n", VERSION);
 		return 0;
 	}
 
@@ -679,7 +679,7 @@
 	if (!gui_check) {
 		char *display = gdk_get_display();
 
-		printf("Gaim %s\n", VERSION);
+		printf(PIDGIN_NAME " %s\n", VERSION);
 
 		g_warning("cannot open display: %s", display ? display : "unset");
 		g_free(display);
@@ -705,7 +705,7 @@
 
 	if (!gaim_core_init(GAIM_GTK_UI)) {
 		fprintf(stderr,
-				"Initialization of the Gaim core failed. Dumping core.\n"
+				"Initialization of the " PIDGIN_NAME " core failed. Dumping core.\n"
 				"Please report this!\n");
 		abort();
 	}