[gaim-migrate @ 5001]

Mon, 10 Mar 2003 06:22:44 +0000

author
Nathan Walp <nwalp@pidgin.im>
date
Mon, 10 Mar 2003 06:22:44 +0000
changeset 4690
e30dbd5b361f
parent 4689
524a0357d05b
child 4691
72487b69d7ef

[gaim-migrate @ 5001]
some cleanups

plugins/ticker/ticker.c file | annotate | diff | comparison | revisions
src/buddy.c file | annotate | diff | comparison | revisions
src/list.c file | annotate | diff | comparison | revisions
src/pounce.c file | annotate | diff | comparison | revisions
src/protocols/gg/gg.c file | annotate | diff | comparison | revisions
src/protocols/icq/gaim_icq.c file | annotate | diff | comparison | revisions
src/protocols/jabber/jabber.c file | annotate | diff | comparison | revisions
src/protocols/msn/msn.c file | annotate | diff | comparison | revisions
src/protocols/oscar/oscar.c file | annotate | diff | comparison | revisions
src/protocols/toc/toc.c file | annotate | diff | comparison | revisions
src/protocols/yahoo/yahoo.c file | annotate | diff | comparison | revisions
--- a/plugins/ticker/ticker.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/plugins/ticker/ticker.c	Mon Mar 10 06:22:44 2003 +0000
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include "gaim.h"
 #include "prpl.h"
-#include "pixmaps/no_icon.xpm"
 #ifdef _WIN32
 #include "win32dep.h"
 #endif
--- a/src/buddy.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/buddy.c	Mon Mar 10 06:22:44 2003 +0000
@@ -35,8 +35,6 @@
 #include <time.h>
 #include <ctype.h>
 
-#include "pixmaps/no_icon.xpm"
-
 #ifdef _WIN32
 #include <gdk/gdkwin32.h>
 #else
@@ -56,8 +54,6 @@
 #include "win32dep.h"
 #endif
 
-static gboolean obscured = FALSE;
-
 static void gaim_gtk_blist_update(struct gaim_buddy_list *list, GaimBlistNode *node);
 
 /***************************************************
@@ -169,7 +165,7 @@
 
 static void gaim_gtk_blist_add_buddy_cb()
 {
-	GtkTreeSelection *sel = gtk_tree_view_get_selection(gtkblist->treeview);
+	GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
 	GtkTreeIter iter;
 	GaimBlistNode *node;
 	GValue val;
@@ -449,18 +445,16 @@
 	GtkTreeViewColumn *column;
 	GtkWidget *sw;
 	GtkWidget *button;
-	GValue *val;
-	GtkTreeIter iter;
-	
+
 	if (gtkblist) {
 		gtk_widget_show(gtkblist->window);
 		return;
 	}
-		
+
 	gtkblist = g_new0(struct gaim_gtk_buddy_list , 1);
 	gtkblist->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(gtkblist->window), _("Buddy List"));
-	
+
 	gtkblist->vbox = gtk_vbox_new(FALSE, 6);
 	gtk_container_add(GTK_CONTAINER(gtkblist->window), gtkblist->vbox);
 
@@ -474,7 +468,7 @@
 	sw = gtk_scrolled_window_new(NULL,NULL);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_widget_set_usize(sw, 200, 200);
+	gtk_widget_set_size_request(sw, 200, 200);
 
 	gtkblist->treemodel = gtk_tree_store_new(BLIST_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, 
 						 G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER);
@@ -537,7 +531,7 @@
 {
 	GaimBlistNode *group = list->root;
 	GaimBlistNode *buddy;
-	
+
 	while (group) {
 		gaim_gtk_blist_update(list, group);
 		buddy = group->child;
@@ -552,20 +546,18 @@
 static void gaim_gtk_blist_update(struct gaim_buddy_list *list, GaimBlistNode *node)