changeset 22832:4409f8a0d7aa

merge of 'ac789033b0d69b98d5985567ad5d3579bde9af12' and 'cce9dfe291731b6645ed3a637f1cf895cdeb57f3'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 07 May 2008 02:53:21 +0000
parents 28005860d2c9 (diff) 9089d36d64c9 (current diff)
children af577b5a6aac ac567757d236
files
diffstat 3 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/silc/chat.c	Wed May 07 02:45:36 2008 +0000
+++ b/libpurple/protocols/silc/chat.c	Wed May 07 02:53:21 2008 +0000
@@ -670,7 +670,7 @@
 
 typedef struct {
 	SilcPurple sg;
-	const char *channel;
+	char *channel;
 } *SilcPurpleChatInput;
 
 static void
@@ -723,7 +723,7 @@
 
 	SilcPurpleChatInput s;
 	SilcChannelEntry channel;
-	const char *ch;
+	char *ch;
 	char tmp[32];
 
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_CHAT(node));
--- a/libpurple/protocols/silc10/chat.c	Wed May 07 02:45:36 2008 +0000
+++ b/libpurple/protocols/silc10/chat.c	Wed May 07 02:53:21 2008 +0000
@@ -651,7 +651,7 @@
 
 typedef struct {
 	SilcPurple sg;
-	const char *channel;
+	char *channel;
 } *SilcPurpleChatInput;
 
 static void
@@ -700,7 +700,7 @@
 
 	SilcPurpleChatInput s;
 	SilcChannelEntry channel;
-	const char *ch;
+	char *ch;
 	char tmp[32];
 
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_CHAT(node));
--- a/pidgin/gtkimhtmltoolbar.c	Wed May 07 02:45:36 2008 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Wed May 07 02:53:21 2008 +0000
@@ -620,7 +620,7 @@
 	struct smiley_button_list *cur;
 	struct smiley_button_list *it, *it_last;
 
-	cur = malloc(sizeof(struct smiley_button_list));
+	cur = g_new0(struct smiley_button_list, 1);
 	it = ls;
 	it_last = ls; /* list iterators*/
 	image = gtk_image_new_from_file(filename);
@@ -732,10 +732,9 @@
 		while (unique_smileys) {
 			GtkIMHtmlSmiley *smiley = unique_smileys->data;
 			if (!smiley->hidden) {
-				fflush(stdout);
 				ls = sort_smileys(ls, toolbar, &max_line_width, smiley->file, smiley->smile);
 			}
-			unique_smileys = unique_smileys->next;
+			unique_smileys = g_slist_delete_link(unique_smileys, unique_smileys);
 		}
 		/* pack buttons of the list */
 		max_line_width = max_line_width / num_lines;
@@ -754,7 +753,7 @@
 			}
 			col++;
 			it = it->next;
-			free(it_tmp);
+			g_free(it_tmp);
 		}
 		gtk_box_pack_start(GTK_BOX(smiley_table), line, FALSE, TRUE, 0);