Mercurial > pidgin.yaz

changeset 10884:5cda52915a1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 12582] Rename create_prpl_icon to gaim_gtk_create_prpl_icon, remove some dead code from gtkconv, and use G_MODULE_BIND_LOCAL - this breaks perl plugins, and should be added to the list of things that need fixing to save perl. Semi-fix the raw plugin too, but only if your filesystem is being friendly in where it puts stuff. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 28 Apr 2005 01:06:31 +0000
parents b0fdadf463d4
children 12083e75627f
files plugins/ChangeLog.API plugins/gevolution/add_buddy_dialog.c plugins/gevolution/gevolution.c plugins/raw.c src/gtkaccount.c src/gtkblist.c src/gtkblist.h src/gtkconn.c src/gtkconv.c src/gtklog.c src/gtknotify.c src/gtkpounce.c src/gtksavedstatuses.c src/plugin.c
diffstat 14 files changed, 23 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/ChangeLog.API	Thu Apr 28 00:55:33 2005 +0000
+++ b/plugins/ChangeLog.API	Thu Apr 28 01:06:31 2005 +0000
@@ -49,6 +49,7 @@
 	           instead.
 	* Removed: serv_rename_group
 	* Renamed: set_gaim_user_dir to gaim_util_set_user_dir
+	* Renamed: create_prpl_icon to gaim_gtk_create_prpl_icon
 
 	Signals:
 	* Changed: "received-im-msg and "received-chat-msg" to match, both
--- a/plugins/gevolution/add_buddy_dialog.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/plugins/gevolution/add_buddy_dialog.c	Thu Apr 28 01:06:31 2005 +0000
@@ -184,7 +184,7 @@
 	if (account == NULL)
 		return;
 
-	pixbuf = create_prpl_icon(account);
+	pixbuf = gaim_gtk_create_prpl_icon(account);
 
 	if (pixbuf != NULL)
 		icon = gdk_pixbuf_scale_simple(pixbuf, 16, 16,
@@ -611,7 +611,7 @@
 	GdkPixbuf *pixbuf, *icon = NULL;
 	GtkTreeIter iter;
 
-	pixbuf = create_prpl_icon(account);
+	pixbuf = gaim_gtk_create_prpl_icon(account);
 
 	if (pixbuf != NULL)
 		icon = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
--- a/plugins/gevolution/gevolution.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/plugins/gevolution/gevolution.c	Thu Apr 28 01:06:31 2005 +0000
@@ -415,7 +415,7 @@
 
 		gtk_list_store_append(model, &iter);
 
-		pixbuf = create_prpl_icon(account);
+		pixbuf = gaim_gtk_create_prpl_icon(account);
 
 		if (pixbuf != NULL)
 		{
--- a/plugins/raw.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/plugins/raw.c	Thu Apr 28 01:06:31 2005 +0000
@@ -1,3 +1,4 @@
+#define GAIM_PLUGINS
 #include "conversation.h"
 #include "debug.h"
 #include "prpl.h"
@@ -13,6 +14,7 @@
 #endif
 
 #include "protocols/jabber/jabber.h"
+#undef GAIM_PLUGINS
 #include "protocols/msn/session.h"
 
 #define RAW_PLUGIN_ID "gtk-raw"
--- a/src/gtkaccount.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtkaccount.c	Thu Apr 28 01:06:31 2005 +0000
@@ -1744,7 +1744,7 @@
 			g_free(pulse_data);
 		}
 
-		pixbuf = create_prpl_icon(account);
+		pixbuf = gaim_gtk_create_prpl_icon(account);
 
 		if (pixbuf != NULL)
 		{
@@ -2131,7 +2131,7 @@
 
 	scale = NULL;
 
-	pixbuf = create_prpl_icon(account);
+	pixbuf = gaim_gtk_create_prpl_icon(account);
 
 	if (pixbuf != NULL)
 	{
--- a/src/gtkblist.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtkblist.c	Thu Apr 28 01:06:31 2005 +0000
@@ -4880,7 +4880,7 @@
  *********************************************************************/
 
 GdkPixbuf *
-create_prpl_icon(GaimAccount *account)
+gaim_gtk_create_prpl_icon(GaimAccount *account)
 {
 	GaimPlugin *prpl;
 	GaimPluginProtocolInfo *prpl_info = NULL;
@@ -5323,7 +5323,7 @@
 			menuitem = gtk_image_menu_item_new_with_label(buf);
 			g_free(buf);
 
-			pixbuf = create_prpl_icon(account);
+			pixbuf = gaim_gtk_create_prpl_icon(account);
 			if (pixbuf) {
 				scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16,
 						GDK_INTERP_BILINEAR);
--- a/src/gtkblist.h	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtkblist.h	Thu Apr 28 01:06:31 2005 +0000
@@ -139,7 +139,7 @@
  *
  * @return         The icon
  */
-GdkPixbuf *create_prpl_icon(GaimAccount *account);
+GdkPixbuf *gaim_gtk_create_prpl_icon(GaimAccount *account);
 
 /**
  * Populates a menu with the items shown on the buddy list for a buddy.
--- a/src/gtkconn.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtkconn.c	Thu Apr 28 01:06:31 2005 +0000
@@ -316,7 +316,7 @@
 		return;
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(disconnect_window->treeview));
-	icon = create_prpl_icon(account);
+	icon = gaim_gtk_create_prpl_icon(account);
 	scale = gdk_pixbuf_scale_simple(icon, 16, 16, GDK_INTERP_BILINEAR);
 
 	/* Mark all disconnections w/ the account type disconnected /w grey icon */
--- a/src/gtkconv.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtkconv.c	Thu Apr 28 01:06:31 2005 +0000
@@ -2321,7 +2321,7 @@
 
 	if (!status) {
 		GdkPixbuf *pixbuf;
-		pixbuf = create_prpl_icon(account);
+		pixbuf = gaim_gtk_create_prpl_icon(account);
 
 		if (small_icon && pixbuf != NULL)
 		{
@@ -3080,7 +3080,7 @@
 		gc = (GaimConnection *)gcs->data;
 
 		/* Create a pixmap for the protocol icon. */
-		pixbuf = create_prpl_icon(gc->account);
+		pixbuf = gaim_gtk_create_prpl_icon(gc->account);
 		scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
 
 		/* Now convert it to GtkImage */
@@ -3162,7 +3162,7 @@
 			}
 
 			/* Create a pixmap for the protocol icon. */
-			pixbuf = create_prpl_icon(account);
+			pixbuf = gaim_gtk_create_prpl_icon(account);
 			scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16,
 											GDK_INTERP_BILINEAR);
 
@@ -4763,7 +4763,6 @@
 	GaimConvWindow *win;
 	GaimConnection *gc;
 	int gtk_font_options = 0;
-	char buf[BUF_LONG];
 	char buf2[BUF_LONG];
 	char mdate[64];
 	char color[10];
@@ -4803,9 +4802,6 @@
 
 	/* TODO: These colors should not be hardcoded so log.c can use them */
 	if (flags & GAIM_MESSAGE_SYSTEM) {
-		g_snprintf(buf, BUF_LONG, "<FONT SIZE=\"2\">(%s)</FONT> <B>%s</B>",
-				   mdate, message);
-
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>",
 			   sml_attrib ? sml_attrib : "", mdate, message);
@@ -4813,9 +4809,6 @@
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 
 	} else if (flags & GAIM_MESSAGE_ERROR) {
-		g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"#ff0000\"><FONT SIZE=\"2\">(%s)</FONT> <B>%s</B></FONT>",
-				   mdate, message);
-
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT></FONT>",
 			   sml_attrib ? sml_attrib : "", mdate, message);
@@ -4823,11 +4816,11 @@
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 
 	} else if (flags & GAIM_MESSAGE_NO_LOG) {
-		g_snprintf(buf, BUF_LONG,
+		g_snprintf(buf2, BUF_LONG,
 			   "<B><FONT %s COLOR=\"#777777\">%s</FONT></B>",
 			   sml_attrib ? sml_attrib : "", message);
 
-		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf, 0);
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 	} else if (flags & GAIM_MESSAGE_RAW) {
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), message, 0);
 	} else {
@@ -4893,11 +4886,6 @@
 			if(who_escaped)
 				g_free(who_escaped);
 		}
-		g_snprintf(buf, BUF_LONG,
-				   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\">(%s)</FONT> "
-				   "<B>%s</B></FONT> ", color,
-				   sml_attrib ? sml_attrib : "", mdate, str);
-
 		g_snprintf(buf2, BUF_LONG,
 			   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--(%s) --></FONT>"
 			   "<B>%s</B></FONT> ",
@@ -4905,8 +4893,7 @@
 
 		g_free(str);
 
-		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml),
-										   buf2, 0);
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 
 		if(gc){
 			char *pre = g_strdup_printf("<font %s>", sml_attrib ? sml_attrib : "");
@@ -4933,7 +4920,6 @@
 		g_free(new_message);
 	}
 
-
 	if(sml_attrib)
 		g_free(sml_attrib);
 }
--- a/src/gtklog.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtklog.c	Thu Apr 28 01:06:31 2005 +0000
@@ -463,7 +463,7 @@
 	}
 
 	display_log_viewer(ht, gaim_log_get_logs(type, screenname, account),
-			title, create_prpl_icon(account));
+			title, gaim_gtk_create_prpl_icon(account));
 	g_free(title);
 }
 
--- a/src/gtknotify.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtknotify.c	Thu Apr 28 01:06:31 2005 +0000
@@ -537,7 +537,7 @@
 	gtk_widget_show(close_button);
 
 	/* Add the buddies to the tree view */
-	icon = create_prpl_icon(gc->account);
+	icon = gaim_gtk_create_prpl_icon(gc->account);
 	scaled = gdk_pixbuf_scale_simple(icon, 16, 16, GDK_INTERP_BILINEAR);
 
 	for (i = 0; results[i] != NULL; i++)
--- a/src/gtkpounce.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtkpounce.c	Thu Apr 28 01:06:31 2005 +0000
@@ -851,7 +851,7 @@
 		item = gtk_image_menu_item_new_with_label(buddyname);
 
 		/* Create a pixmap for the protocol icon. */
-		pixbuf = create_prpl_icon(gaim_pounce_get_pouncer(pounce));
+		pixbuf = gaim_gtk_create_prpl_icon(gaim_pounce_get_pouncer(pounce));
 		if (pixbuf != NULL)
 		{
 			scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16,
--- a/src/gtksavedstatuses.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtksavedstatuses.c	Thu Apr 28 01:06:31 2005 +0000
@@ -644,7 +644,7 @@
 
 	scale = NULL;
 
-	pixbuf = create_prpl_icon(account);
+	pixbuf = gaim_gtk_create_prpl_icon(account);
 
 	if (pixbuf != NULL)
 	{
--- a/src/plugin.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/plugin.c	Thu Apr 28 01:06:31 2005 +0000
@@ -216,7 +216,7 @@
 		 *       space.  However, it caused problems with using a
 		 *       perl script for me.  If it works for you then go for it.
 		 */
-		plugin->handle = g_module_open(filename, 0);
+		plugin->handle = g_module_open(filename, G_MODULE_BIND_LOCAL);
 
 		if (plugin->handle == NULL)
 		{