Mercurial > pidgin.yaz

changeset 1233:728a90516211

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 1243] passing -Wall committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Mon, 11 Dec 2000 12:50:38 +0000
parents 0c7c659fc730
children cedf7047081e
files src/about.c src/buddy.c src/dialogs.c src/oscar.c src/perl.c src/rvous.c
diffstat 6 files changed, 33 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- a/src/about.c	Mon Dec 11 11:44:22 2000 +0000
+++ b/src/about.c	Mon Dec 11 12:50:38 2000 +0000
@@ -66,7 +66,6 @@
 	GdkPixmap *pm;
 	GdkBitmap *bm;
 	GtkWidget *hbox;
-	GtkWidget *eventbox;
 	GtkWidget *button;
 
 	char abouttitle[45];
--- a/src/buddy.c	Mon Dec 11 11:44:22 2000 +0000
+++ b/src/buddy.c	Mon Dec 11 12:50:38 2000 +0000
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
--- a/src/dialogs.c	Mon Dec 11 11:44:22 2000 +0000
+++ b/src/dialogs.c	Mon Dec 11 12:50:38 2000 +0000
@@ -641,22 +641,38 @@
         GtkWidget *label;
 
         if (!imdialog) {
-
-                imdialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		imdialog = gtk_window_new(GTK_WINDOW_DIALOG);
 		gtk_window_set_wmclass(GTK_WINDOW(imdialog), "imdialog",
-                                       "Gaim");
+				       "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(imdialog), FALSE, TRUE, TRUE);
-                gtk_widget_realize(imdialog);
-
-                mainbox = gtk_vbox_new(FALSE, 5);
+		gtk_window_set_title(GTK_WINDOW(imdialog), _("Gaim - IM user"));
+		gtk_signal_connect(GTK_OBJECT(imdialog), "destroy",
+				   GTK_SIGNAL_FUNC(destroy_dialog), imdialog);
+		gtk_widget_realize(imdialog);
+		aol_icon(imdialog->window);
+
+		mainbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
 		gtk_container_add(GTK_CONTAINER(imdialog), mainbox);
 
 		frame = gtk_frame_new(_("Send Instant Message"));
-                gtk_box_pack_start(GTK_BOX(mainbox), frame, TRUE, TRUE, 0);
-	
+		gtk_box_pack_start(GTK_BOX(mainbox), frame, TRUE, TRUE, 0);
+
+		fbox = gtk_hbox_new(FALSE, 5);
+		gtk_container_set_border_width(GTK_CONTAINER(fbox), 5);
+		gtk_container_add(GTK_CONTAINER(frame), fbox);
+
+		label = gtk_label_new(_("IM who:"));
+		gtk_box_pack_start(GTK_BOX(fbox), label, FALSE, FALSE, 0);
+
+		imentry = gtk_entry_new();
+		gtk_box_pack_start(GTK_BOX(fbox), imentry, TRUE, TRUE, 0);
+		gtk_signal_connect(GTK_OBJECT(imentry), "activate",
+				   GTK_SIGNAL_FUNC(do_im), imentry);
+		gtk_widget_grab_focus(imentry);
+
 		bbox = gtk_hbox_new(FALSE, 5);
-                gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0);
 
 		button = picture_button(imdialog, _("Cancel"), cancel_xpm);
 		gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
@@ -667,29 +683,8 @@
 		gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
 				   GTK_SIGNAL_FUNC(do_im), imentry);
-
-		fbox = gtk_hbox_new(FALSE, 5);
-		gtk_container_set_border_width(GTK_CONTAINER(fbox), 5);
-		gtk_container_add(GTK_CONTAINER(frame), fbox);
-
-                label = gtk_label_new(_("IM who:"));
-                gtk_box_pack_start(GTK_BOX(fbox), label, FALSE, FALSE, 0);
-
-		imentry = gtk_entry_new();
-                gtk_box_pack_start(GTK_BOX(fbox), imentry, TRUE, TRUE, 0);
-
-                /* Handle closes right */
-		gtk_signal_connect(GTK_OBJECT(imentry), "activate",
-				   GTK_SIGNAL_FUNC(do_im), imentry);
-                gtk_signal_connect(GTK_OBJECT(imdialog), "destroy",
-                                   GTK_SIGNAL_FUNC(destroy_dialog), imdialog);
-
-		/* Finish up */
-		gtk_window_set_title(GTK_WINDOW(imdialog), _("Gaim - IM user"));
-                gtk_widget_grab_focus(imentry);
-		
-		aol_icon(imdialog->window);
         }
+
         gtk_widget_show_all(imdialog);
 }
 
@@ -769,8 +764,6 @@
 {
 	char *grp, *who, *whoalias;
         struct conversation *c;
-	GSList *n = connections;
-	struct gaim_connection *g;
         
 	who = gtk_entry_get_text(GTK_ENTRY(a->entry));
         grp = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry));
@@ -1832,7 +1825,6 @@
 
         char *who;
         char *name;
-        int d = 0;
 
 
         who = gtk_entry_get_text(GTK_ENTRY(p->entry));
--- a/src/oscar.c	Mon Dec 11 11:44:22 2000 +0000
+++ b/src/oscar.c	Mon Dec 11 12:50:38 2000 +0000
@@ -859,7 +859,7 @@
 	gt = find_getfile_transfer(od, oftconn);
 
 	if (gt->window)
-		return;
+		return 1;
 
 	gt->window = gtk_dialog_new();
 	gtk_window_set_title(GTK_WINDOW(gt->window), _("Gaim - File Transfer"));
@@ -890,7 +890,6 @@
 
 static void getfile_send_callback(gpointer data, gint source, GdkInputCondition condition) {
 	struct getfile_transfer *gt = (struct getfile_transfer *)data;
-	char buf[1024];
 	int result;
 
 	result = aim_getfile_send_chunk(gt->conn, gt->file, gt->fh, -1, 1024);
@@ -908,12 +907,11 @@
 	struct gaim_connection *gc = find_gaim_conn_by_aim_sess(sess);
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
 	struct getfile_transfer *gt;
-	int result;
 
 	va_list ap;
 	struct aim_conn_t *oftconn;
 	struct aim_fileheader_t *fh;
-	char *path, *cookie;
+	char *cookie;
 
 	va_start(ap, command);
 	oftconn = va_arg(ap, struct aim_conn_t *);
@@ -925,7 +923,7 @@
 
 	if (gt->gop > 0) {
 		debug_printf("already have output watcher?\n");
-		return;
+		return 1;
 	}
 
 	if ((gt->file = fopen(gt->filename, "r")) == NULL) {
@@ -1035,7 +1033,7 @@
 	ft = localtime(&st.st_ctime);
 	fprintf(file, "%2d/%2d/%4d %2d:%2d %8ld ",
 			ft->tm_mon + 1, ft->tm_mday, ft->tm_year + 1900,
-			ft->tm_hour + 1, ft->tm_min + 1, st.st_size);
+			ft->tm_hour + 1, ft->tm_min + 1, (long)st.st_size);
 	fprintf(file, "%s\r\n", g_basename(filename));
 	rewind(file);
 
@@ -1293,7 +1291,6 @@
 	char *msg;
 	u_short id;
 	va_list ap;
-	struct gaim_connection *gc = find_gaim_conn_by_aim_sess(sess);
 
 	va_start(ap, command);
 	id  = (u_short)va_arg(ap, u_int);
--- a/src/perl.c	Mon Dec 11 11:44:22 2000 +0000
+++ b/src/perl.c	Mon Dec 11 12:50:38 2000 +0000
@@ -45,8 +45,6 @@
 #include <stdio.h>
 #include <dirent.h>
 #include <gtk/gtk.h>
-#include "pixmaps/add.xpm"
-#include "pixmaps/cancel.xpm"
 
 
 /* perl module support */
@@ -627,7 +625,7 @@
 
 void load_perl_script(GtkWidget *w, gpointer d)
 {
-	char *buf, *temp;
+	char *buf;
 
 	if (config) {
 		gtk_widget_show(config);
--- a/src/rvous.c	Mon Dec 11 11:44:22 2000 +0000
+++ b/src/rvous.c	Mon Dec 11 12:50:38 2000 +0000
@@ -647,7 +647,7 @@
 	at = g_snprintf(buf, ntohl(fhdr.size) + 1, "%2d/%2d/%4d %2d:%2d %8ld ",
 			fortime->tm_mon + 1, fortime->tm_mday, fortime->tm_year + 1900,
 			fortime->tm_hour + 1, fortime->tm_min + 1,
-			st.st_size);
+			(long)st.st_size);
 	g_snprintf(buf + at, ntohl(fhdr.size) + 1 - at, "%s\r\n", c);
 	sprintf(debug_buff, "Sending listing.txt (%d bytes) to %s\n",
 			ntohl(fhdr.size) + 1, ft->user);