changeset 4655:fac4c73dd5ad

[gaim-migrate @ 4966] cleanups for some plugins that aren't compiled by default committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Thu, 06 Mar 2003 17:27:17 +0000
parents 374384081171
children e557a10a9541
files plugins/mailchk.c plugins/raw.c
diffstat 2 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mailchk.c	Thu Mar 06 03:09:20 2003 +0000
+++ b/plugins/mailchk.c	Thu Mar 06 17:27:17 2003 +0000
@@ -25,11 +25,9 @@
 	struct stat s;
 	gint ret = 0;
 
-	filename = g_getenv("MAIL");
+	filename = g_strdup(g_getenv("MAIL"));
 	if (!filename)
 		filename = g_strconcat("/var/spool/mail/", g_get_user_name(), NULL);
-	else
-		filename = g_strdup(filename);
 
 	if (stat(filename, &s) < 0) {
 		g_free(filename);
@@ -64,7 +62,7 @@
 
 	if (!mail) {
 		/* guess we better build it then :P */
-		GList *tmp = gtk_container_children(GTK_CONTAINER(blist));
+		GList *tmp = gtk_container_get_children(GTK_CONTAINER(blist));
 		GtkWidget *vbox2 = (GtkWidget *)tmp->data;
 
 		mail = gtk_label_new("No mail messages.");
--- a/plugins/raw.c	Thu Mar 06 03:09:20 2003 +0000
+++ b/plugins/raw.c	Thu Mar 06 17:27:17 2003 +0000
@@ -49,7 +49,7 @@
 
 static void send_it(GtkEntry *entry)
 {
-	char *txt;
+	const char *txt;
 	if (!gc) return;
 	txt = gtk_entry_get_text(entry);
 	switch (gc->protocol) {
@@ -108,11 +108,11 @@
 			continue;
 		if (!gc)
 			gc = c;
-		g_snprintf(buf, sizeof buf, "%s (%s)", c->username, (*c->prpl->name)());
+		g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name);
 		opt = gtk_menu_item_new_with_label(buf);
 		g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(set_gc), c);
 		gtk_widget_show(opt);
-		gtk_menu_append(GTK_MENU(menu), opt);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
 	}
 
 	gtk_option_menu_remove_menu(GTK_OPTION_MENU(optmenu));