Mercurial > pidgin

changeset 1456:6650776468b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 1466] trying to pass -Wall committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 01 Feb 2001 08:37:16 +0000
parents d113c7e2c5f1
children c6f9d0cdaa00
files src/applet.c src/away.c src/buddy.c src/conversation.c src/dialogs.c src/gaim.h src/gaimrc.c src/gtkimhtml.c src/server.c
diffstat 9 files changed, 18 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/src/applet.c	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/applet.c	Thu Feb 01 08:37:16 2001 +0000
@@ -219,24 +219,6 @@
 	applet_widget_unregister_callback(APPLET_WIDGET(applet), "away");
 }
 
-static void applet_show_about(AppletWidget *widget, gpointer data) {
-  
-  const gchar *authors[] = {"Mark Spencer <markster@marko.net>",
-                            "Jim Duchek <jimduchek@ou.edu>",
-                            "Rob Flynn <rflynn@blueridge.net>",
-			    "Eric Warmenhoven <warmenhoven@yahoo.com>",
-			    "Syd Logan",
-                            NULL};
-
-  GtkWidget *about=gnome_about_new(_("GAIM"),
-				   _(VERSION),
-				   _(""),
-				   authors,
-				   "",
-				   NULL);
-  gtk_widget_show(about);
-}
-
 static GtkAllocation get_applet_pos(gboolean for_blist) {
 	gint x,y,pad;
 	GtkRequisition buddy_req, applet_req;
@@ -390,7 +372,7 @@
 					      "about",
 					      GNOME_STOCK_MENU_ABOUT,
 					      _("About..."),
-					      applet_show_about,
+					      (AppletCallbackFunc)show_about,
 					      NULL);
 					      
 	gtk_signal_connect( GTK_OBJECT(applet), "button_press_event", GTK_SIGNAL_FUNC( AppletClicked), NULL);
--- a/src/away.c	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/away.c	Thu Feb 01 08:37:16 2001 +0000
@@ -216,7 +216,7 @@
 	GSList *awy = away_messages;
 	struct away_message *a;
 	GSList *con = connections;
-	struct gaim_connection *gc;
+	struct gaim_connection *gc = NULL;
 	int count = 0;
 
 #ifdef USE_APPLET
--- a/src/buddy.c	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/buddy.c	Thu Feb 01 08:37:16 2001 +0000
@@ -57,8 +57,9 @@
 #include "pixmaps/search_small.xpm"
 #ifdef USE_APPLET
 #include "pixmaps/close_small.xpm"
+#else
+#include "pixmaps/exit_small.xpm"
 #endif
-#include "pixmaps/exit_small.xpm"
 #include "pixmaps/pounce_small.xpm"
 #include "pixmaps/about_small.xpm"
 
@@ -496,7 +497,6 @@
 static gboolean click_edit_tree(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
 	GtkCTreeNode *node;
-	GList *i;
 	int *type;
 	int row, column;
 	GtkWidget *menu;
@@ -511,7 +511,7 @@
 	node = gtk_ctree_node_nth(GTK_CTREE(edittree), row);
 	type = gtk_ctree_node_get_row_data(GTK_CTREE(edittree), node);
 	if (*type == EDIT_GROUP) {
-		struct group *group = (struct group *)type;
+		/*struct group *group = (struct group *)type;*/
 		menu = gtk_menu_new();
 
 		button = gtk_menu_item_new_with_label(_("Rename"));
@@ -551,6 +551,8 @@
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
 			       event->button, event->time);
 	}
+
+	return TRUE;
 }
 
 
@@ -768,9 +770,8 @@
 static void edit_tree_move (GtkCTree *ctree, GtkCTreeNode *child, GtkCTreeNode *parent,
                  GtkCTreeNode *sibling, gpointer data)
 {
-	gboolean leaf;
 	struct gaim_connection *gc, *pc = NULL, *sc = NULL;
-	int *ctype, *ptype, *stype;
+	int *ctype, *ptype = NULL, *stype = NULL;
 	
 	ctype = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), child);
 	
@@ -1051,10 +1052,8 @@
 static void do_del_buddy(GtkWidget *w, GtkCTree *ctree)
 {
 	GtkCTreeNode *node;
-        char *bud, *grp;
 	struct buddy *b;
 	struct group *g;
-	struct gaim_connection *gc;
 	int *type;
 	GList *i;
 	
--- a/src/conversation.c	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/conversation.c	Thu Feb 01 08:37:16 2001 +0000
@@ -1122,7 +1122,6 @@
 void write_to_conv(struct conversation *c, char *what, int flags, char *who)
 {
 	char *buf = g_malloc(BUF_LONG);
-	char buf2[1024];
 	char *str;
 	FILE *fd;
 	char colour[10];
--- a/src/dialogs.c	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/dialogs.c	Thu Feb 01 08:37:16 2001 +0000
@@ -1255,7 +1255,6 @@
 void do_save_info(GtkWidget *widget, struct set_info_dlg *b)
 {
 	gchar *junk;
-	char *buf;
 	struct gaim_connection *gc;
 
 	junk = gtk_editable_get_chars(GTK_EDITABLE(b->text), 0, -1);
@@ -2814,7 +2813,6 @@
 	char *file;
 	struct stat sbuf;
 	char *g_screenname;
-	int i;
 
 	g_screenname = get_screenname_filename(gc->username);
 
@@ -2876,7 +2874,6 @@
 		GSList *c = connections;
 		struct gaim_connection *g;
 		char *g_screenname;
-		int i;
 
 		file = gaim_user_dir();
 		if ( file != (char *) NULL ) {
@@ -2958,7 +2955,6 @@
 	char *file;
 	char path[PATHSIZE];
 	char *g_screenname;
-	int i;
 	int len;
         FILE *f;
 	gboolean from_dialog = FALSE;
--- a/src/gaim.h	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/gaim.h	Thu Feb 01 08:37:16 2001 +0000
@@ -602,7 +602,7 @@
 extern void serv_set_idle(struct gaim_connection *, int);
 extern void serv_set_info(struct gaim_connection *, char *);
 extern void serv_set_away(struct gaim_connection *, char *, char *);
-extern void serv_set_all_away(char *);
+extern void serv_set_away_all(char *);
 extern void serv_change_passwd(struct gaim_connection *, char *, char *);
 extern void serv_add_buddy(struct gaim_connection *, char *);
 extern void serv_add_buddies(struct gaim_connection *, GList *);
@@ -661,6 +661,9 @@
 extern void redo_convo_menus();
 extern void toggle_spellchk();
 extern void update_buttons_by_protocol(struct conversation *);
+extern void toggle_smileys();
+extern void toggle_timestamps();
+extern void update_pixmaps();
 
 /* Functions in toc.c */
 extern void parse_toc_buddy_list(struct gaim_connection *, char *, int);
@@ -763,7 +766,8 @@
 gint sort_awaymsg_list(gconstpointer, gconstpointer);
 
 /* Functions in dialogs.c */
-extern void alias_dialog(struct buddy_show *);
+extern void alias_dialog_bs(struct buddy_show *);
+extern void alias_dialog_bud(struct buddy *);
 extern void do_export(GtkWidget *, void *);
 extern void show_warn_dialog(struct gaim_connection *, char *);
 extern void do_error_dialog(char *, char *);
--- a/src/gaimrc.c	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/gaimrc.c	Thu Feb 01 08:37:16 2001 +0000
@@ -480,7 +480,7 @@
 		}
 	}
 
-	if (i = strlen(u->user_info)) {
+	if ((i = strlen(u->user_info))) {
 		u->user_info[i-1] = '\0';
 	}
 
--- a/src/gtkimhtml.c	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/gtkimhtml.c	Thu Feb 01 08:37:16 2001 +0000
@@ -956,10 +956,10 @@
 	GtkAdjustment *hadj = GTK_LAYOUT (widget)->hadjustment;
 	gint x, y;
 
+	x = event->x + hadj->value;
+	y = event->y + vadj->value;
+
 	if ((event->button == 1) && imhtml->selection) {
-		x = event->x + hadj->value;
-		y = event->y + vadj->value;
-
 		if ((x == imhtml->sel_startx) && (y == imhtml->sel_starty)) {
 			imhtml->sel_startx = imhtml->sel_starty = 0;
 			imhtml->selection = FALSE;
--- a/src/server.c	Thu Feb 01 08:13:00 2001 +0000
+++ b/src/server.c	Thu Feb 01 08:37:16 2001 +0000
@@ -94,8 +94,6 @@
 
 void serv_finish_login(struct gaim_connection *gc)
 {
-	char *buf;
-
 	if (strlen(gc->user->user_info)) {
 		//g_malloc(strlen(gc->user->user_info) * 4);
 		//strncpy_withhtml(buf, gc->user->user_info, strlen(gc->user->user_info) * 4);