Mercurial > pidgin

changeset 4690:e19f91053ad0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 5001] some cleanups committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Mon, 10 Mar 2003 06:22:44 +0000
parents 69b19e132df0
children d78f7cb8ae4f
files plugins/ticker/ticker.c src/buddy.c src/list.c src/pounce.c src/protocols/gg/gg.c src/protocols/icq/gaim_icq.c src/protocols/jabber/jabber.c src/protocols/msn/msn.c src/protocols/oscar/oscar.c src/protocols/toc/toc.c src/protocols/yahoo/yahoo.c
diffstat 11 files changed, 16 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- 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)
 {
 	GtkTreeIter *iter = node->ui_data;
-	GtkTreePath *path;
-	GdkPixbuf *buf = NULL;
 	gboolean expand = FALSE;
 
 	if (!gtkblist)
 		return;
-				
+
 	if (!iter) { /* This is a newly added node */
 		if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
 			if (((struct buddy*)node)->present) {
 				if(node->parent && node->parent && !node->parent->ui_data) {
-					
+
 					/* This buddy's group has not yet been added.  We do that here */
-					
+
 					char *mark = g_strdup_printf("<span weight='bold'>%s</span>",  ((struct group*)node->parent)->name);
 					GtkTreeIter *iter2 = g_new0(GtkTreeIter, 1);
 					GaimBlistNode *insertat = node->parent->prev;
@@ -576,7 +568,7 @@
 						insertat = insertat->prev;
 					if (insertat)
 						insertatiter = insertat->ui_data;
-					
+
 					/* This is where we create the node and add it. */
 					gtk_tree_store_insert_after(gtkblist->treemodel, iter2, 
 								    node->parent->parent ? node->parent->parent->ui_data : NULL, insertatiter);
--- a/src/list.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/list.c	Mon Mar 10 06:22:44 2003 +0000
@@ -72,7 +72,7 @@
 	if (!gaimbuddylist)
 		return;
 	while (group) {
-		debug_printf("+-%s %d\n", ((struct group*)group)->name, group);
+		debug_printf("+-%s %p\n", ((struct group*)group)->name, group);
 		buddy = group->child;
 		while (buddy) {
 			debug_printf("|--- %d %s\t\t%d\n", ((struct buddy*)buddy)->present, ((struct buddy*)buddy)->name, ((struct buddy*)buddy)->idle);
@@ -103,7 +103,6 @@
 void gaim_blist_destroy()
 {
 	struct gaim_blist_ui_ops *ops = gaimbuddylist->ui_ops;
-	GaimBlistNode *node = gaimbuddylist->root;
 	if (ops)
 		ops->destroy(gaimbuddylist);
 }
--- a/src/pounce.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/pounce.c	Mon Mar 10 06:22:44 2003 +0000
@@ -339,7 +339,7 @@
 		opt = gtk_menu_item_new_with_label(buf);
 		gtk_object_set_user_data(GTK_OBJECT(opt), account);
 		g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(pounce_choose), b);
-		gtk_menu_shell_append(GTK_MENU(menu), opt);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
 		gtk_widget_show(opt);
 
 		if (b->account == account) {
@@ -384,7 +384,7 @@
 	}
 
 	GAIM_DIALOG(b->window);
-	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
+	gtk_window_set_resizable(GTK_WINDOW(b->window), TRUE);
 	gtk_window_set_role(GTK_WINDOW(b->window), "new_bp");
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce"));
 	g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(gtk_widget_destroy), b->window);
--- a/src/protocols/gg/gg.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/protocols/gg/gg.c	Mon Mar 10 06:22:44 2003 +0000
@@ -1,6 +1,6 @@
 /*
  * gaim - Gadu-Gadu Protocol Plugin
- * $Id: gg.c 4998 2003-03-10 05:30:31Z seanegan $
+ * $Id: gg.c 5001 2003-03-10 06:22:44Z faceprint $
  *
  * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  * 
@@ -54,11 +54,6 @@
 #include "win32dep.h"
 #endif
 
-#include "pixmaps/protocols/gg/gg_suncloud.xpm"
-#include "pixmaps/protocols/gg/gg_sunred.xpm"
-#include "pixmaps/protocols/gg/gg_sunwhitered.xpm"
-#include "pixmaps/protocols/gg/gg_sunyellow.xpm"
-
 #define USEROPT_NICK 0
 
 #define AGG_BUF_LEN 1024
--- a/src/protocols/icq/gaim_icq.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/protocols/icq/gaim_icq.c	Mon Mar 10 06:22:44 2003 +0000
@@ -6,13 +6,6 @@
 #include "prpl.h"  /* needed for prpl */
 #include "proxy.h"
 
-#include "pixmaps/protocols/icq/gnomeicu-online.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-away.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-dnd.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-na.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-occ.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-ffc.xpm"
-
 #define USEROPT_NICK 0
 
 static struct prpl *my_protocol = NULL;
--- a/src/protocols/jabber/jabber.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/protocols/jabber/jabber.c	Mon Mar 10 06:22:44 2003 +0000
@@ -60,13 +60,6 @@
 #include "win32dep.h"
 #endif
 
-#include "pixmaps/protocols/jabber/available.xpm"
-#include "pixmaps/protocols/jabber/available-away.xpm"
-#include "pixmaps/protocols/jabber/available-chat.xpm"
-#include "pixmaps/protocols/jabber/available-xa.xpm"
-#include "pixmaps/protocols/jabber/available-dnd.xpm"
-#include "pixmaps/protocols/jabber/available-error.xpm"
-
 static struct prpl *my_protocol = NULL;
 
 /* for win32 compatability */
--- a/src/protocols/msn/msn.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/protocols/msn/msn.c	Mon Mar 10 06:22:44 2003 +0000
@@ -26,10 +26,6 @@
 #include "win32dep.h"
 #endif
 
-#include "pixmaps/protocols/msn/msn_online.xpm"
-#include "pixmaps/protocols/msn/msn_away.xpm"
-#include "pixmaps/protocols/msn/msn_occ.xpm"
-
 #define BUDDY_ALIAS_MAXLEN 388
 
 static struct prpl *my_protocol = NULL;
@@ -543,7 +539,7 @@
 					struct group *g;
 					printf("I'm adding %s now..\n", mb->user);
 					if (!(g = gaim_find_group(_("Buddies")))) {
-						printf("How could I not exitst!??!\n");
+						printf("How could I not exitst!?!\n");
 						g = gaim_group_new(_("Buddies"));
 						gaim_blist_add_group(g, NULL);
 					}
--- a/src/protocols/oscar/oscar.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Mon Mar 10 06:22:44 2003 +0000
@@ -55,22 +55,6 @@
 #include "win32dep.h"
 #endif
 
-#include "pixmaps/protocols/oscar/ab.xpm"
-#include "pixmaps/protocols/oscar/admin_icon.xpm"
-#include "pixmaps/protocols/oscar/aol_icon.xpm"
-#include "pixmaps/protocols/oscar/away_icon.xpm"
-#include "pixmaps/protocols/oscar/dt_icon.xpm"
-#include "pixmaps/protocols/oscar/free_icon.xpm"
-#include "pixmaps/protocols/oscar/wireless_icon.xpm"
-
-#include "pixmaps/protocols/icq/gnomeicu-online.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-offline.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-away.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-dnd.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-na.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-occ.xpm"
-#include "pixmaps/protocols/icq/gnomeicu-ffc.xpm"
-
 /* constants to identify proto_opts */
 #define USEROPT_AUTH      0
 #define USEROPT_AUTHPORT  1
@@ -4815,7 +4799,7 @@
 	return "aim";
 }
 
-static const char **oscar_list_emblems(struct buddy *b, char **se, char **sw, char **nw, char **ne)
+static void oscar_list_emblems(struct buddy *b, char **se, char **sw, char **nw, char **ne)
 {
 	char *emblems[4] = {NULL,NULL,NULL,NULL};
 	int i = 0;
--- a/src/protocols/toc/toc.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/protocols/toc/toc.c	Mon Mar 10 06:22:44 2003 +0000
@@ -52,13 +52,6 @@
 #include "win32dep.h"
 #endif
 
-#include "pixmaps/protocols/oscar/admin_icon.xpm"
-#include "pixmaps/protocols/oscar/aol_icon.xpm"
-#include "pixmaps/protocols/oscar/away_icon.xpm"
-#include "pixmaps/protocols/oscar/dt_icon.xpm"
-#include "pixmaps/protocols/oscar/free_icon.xpm"
-#include "pixmaps/protocols/oscar/wireless_icon.xpm"
-
 static struct prpl *my_protocol = NULL;
 
 /* for win32 compatability */
--- a/src/protocols/yahoo/yahoo.c	Mon Mar 10 05:54:25 2003 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon Mar 10 06:22:44 2003 +0000
@@ -56,11 +56,6 @@
 /* for win32 compatability */
 G_MODULE_IMPORT GSList *connections;
 
-#include "pixmaps/status-away.xpm"
-#include "pixmaps/status-here.xpm"
-#include "pixmaps/status-idle.xpm"
-#include "pixmaps/status-game.xpm"
-
 #define YAHOO_DEBUG
 
 #define USEROPT_MAIL 0