Mercurial > pidgin.yaz

changeset 411:a330017b3aa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 421] Trying to make things compile cleanly committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 15 Jun 2000 05:27:25 +0000
parents 9e8c02ed5d06
children ad08e67ec874
files po/.cvsignore src/buddy_chat.c src/conversation.c src/dialogs.c src/gaim.h src/gnome_applet_mgr.c src/gnome_applet_mgr.h src/oscar.c src/prefs.c src/rvous.c src/server.c
diffstat 11 files changed, 48 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/po/.cvsignore	Thu Jun 15 00:50:59 2000 +0000
+++ b/po/.cvsignore	Thu Jun 15 05:27:25 2000 +0000
@@ -3,6 +3,6 @@
 POTFILES
 cat-id-tbl.c
 de.gmo
+fr.gmo
 stamp-cat-id
 gaim.pot
-fr.po
--- a/src/buddy_chat.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/buddy_chat.c	Thu Jun 15 05:27:25 2000 +0000
@@ -45,9 +45,11 @@
 #include "pixmaps/speaker.xpm"
 #include "pixmaps/wood.xpm"
 
+/*
 #include "pixmaps/smile_happy.xpm"
 #include "pixmaps/smile_sad.xpm"
 #include "pixmaps/smile_wink.xpm"
+*/
 
 static GtkWidget *joinchat;
 static GtkWidget *entry;
--- a/src/conversation.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/conversation.c	Thu Jun 15 05:27:25 2000 +0000
@@ -154,7 +154,7 @@
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 	t = s;
 		
-	if (t = strstr(s, prefix))
+	if ((t = strstr(s, prefix)) != NULL)
 	{
 		for (i = 1; t[i] != '\0'; i++)
 		{
@@ -310,7 +310,7 @@
 void set_font_face(GtkWidget *widget, struct conversation *c)
 {
 	char *pre_fontface, *old_font_face;
-	int alloc = 0, length;
+	int alloc = 0;
 
 	if (!(font_options & OPT_FONT_FACE))
 		return;
@@ -330,7 +330,7 @@
 		pre_fontface = "<FONT FACE=\"Helvetica\">";
 	}
 
-	if (old_font_face = get_tag_by_prefix(c->entry, "<FONT FACE"))
+	if ((old_font_face = get_tag_by_prefix(c->entry, "<FONT FACE")) != NULL)
 	{	
 		remove_tags(c->entry, old_font_face);
 		remove_tags(c->entry, "</FONT>");
--- a/src/dialogs.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/dialogs.c	Thu Jun 15 05:27:25 2000 +0000
@@ -49,8 +49,6 @@
 static GList *dialogwindows = NULL;
 static GtkWidget *linkdialog, *exportdialog, *importdialog, *logdialog;
 
-static void accept_callback(GtkWidget *widget, struct file_transfer *t);
-
 struct create_away {
         GtkWidget *window;
         GtkWidget *entry;
@@ -1095,7 +1093,6 @@
 void do_change_password(GtkWidget *widget, struct passwddlg *b)
 {
 	gchar *orig, *new1, *new2;
-	gchar *buf;
 
 	orig = gtk_entry_get_text(GTK_ENTRY(b->original));
 	new1 = gtk_entry_get_text(GTK_ENTRY(b->new1));
@@ -1369,9 +1366,6 @@
 	GtkWidget *text;
         GtkWidget *bbox;
         GtkWidget *sw;
-	GdkBitmap *mask;
-	GdkPixmap *face;
-	GtkWidget *face_p;
 
         struct info_dlg *b = g_new0(struct info_dlg, 1);
 
@@ -1940,7 +1934,7 @@
 	gtk_color_selection_get_color (colorsel, color);
 
 	c = gtk_object_get_user_data(GTK_OBJECT(colorsel));
-	GTK_IS_EDITABLE(c->entry);
+	/* GTK_IS_EDITABLE(c->entry); huh? */
 
 	text_color.red = ((guint16)(color[0]*65535))>>8;
 	text_color.green = ((guint16)(color[1]*65535))>>8;
--- a/src/gaim.h	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/gaim.h	Thu Jun 15 05:27:25 2000 +0000
@@ -386,7 +386,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 401 $"
+#define REVISION "gaim:$Revision: 421 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -592,6 +592,8 @@
 extern void serv_got_joined_chat(int, char *);
 extern void serv_got_chat_left(int);
 extern void serv_got_chat_in(int, char *, int, char *);
+extern void serv_rvous_accept(char *, char *, char *);
+extern void serv_rvous_cancel(char *, char *, char *);
 
 /* Functions in conversation.c */
 extern void write_to_conv(struct conversation *, char *, int);
@@ -617,6 +619,10 @@
 extern void do_normal(GtkWidget *, GtkWidget *);
 extern void do_big(GtkWidget *, GtkWidget *);
 extern void do_link(GtkWidget *, GtkWidget *);
+extern int invert_tags(GtkWidget *, char *, char *, int);
+extern void quiet_set(GtkWidget *, int);
+extern int count_tag(GtkWidget *, char *, char *);
+extern void set_font_face(GtkWidget *, struct conversation *);
 
 /* Functions in network.c */
 extern unsigned int *get_address(char *);
@@ -737,6 +743,8 @@
 extern void show_ee_dialog(int);
 extern void show_add_link(GtkWidget *, GtkWidget *);
 extern void show_change_passwd();
+extern void do_import(GtkWidget *, void *);
+extern int bud_list_cache_exists();
 
 extern void show_font_dialog(struct conversation *c, GtkWidget *font);
 extern void cancel_font(GtkWidget *widget, struct conversation *c);
--- a/src/gnome_applet_mgr.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/gnome_applet_mgr.c	Thu Jun 15 05:27:25 2000 +0000
@@ -271,7 +271,7 @@
 void applet_do_signon(AppletWidget *widget, gpointer data) {
 	show_login();
 	if (general_options & OPT_GEN_REMEMBER_PASS)
-		dologin();
+		dologin(0, 0);
 }
 
 void insert_applet_away() {
@@ -469,7 +469,7 @@
 
 void closeOnlinePopup(){
     set_applet_draw_closed();
-    applet_destroy_buddy();
+    applet_destroy_buddy(0, 0, 0);
 }
 
 
--- a/src/gnome_applet_mgr.h	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/gnome_applet_mgr.h	Thu Jun 15 05:27:25 2000 +0000
@@ -62,22 +62,26 @@
 #define GAIM_GNOME_PENGUIN_CONNECT "gaim/gnome/penguin-connect.png"
 #define GAIM_GNOME_PENGUIN_ONLINE "gaim/gnome/penguin-online.png"
 
-gint init_applet_mgr();
-void applet_do_signon(AppletWidget *, gpointer);
+extern gint init_applet_mgr();
+extern void applet_do_signon(AppletWidget *, gpointer);
+extern void make_buddy();
+extern void cancel_logon();
+extern gint applet_destroy_buddy(GtkWidget *, GdkEvent *, gpointer *);
 
-void setUserState( enum gaim_user_states state );
-enum gaim_user_states getUserState();
-
-void AppletCancelLogon(); /* Used to cancel a logon and reset the applet */ 
+extern void setUserState( enum gaim_user_states state );
+extern enum gaim_user_states getUserState();
 
-void set_applet_draw_open();
-void set_applet_draw_closed();
+extern void AppletCancelLogon();
+
+extern void set_applet_draw_open();
+extern void set_applet_draw_closed();
 
-void insert_applet_away();
-void remove_applet_away();
+extern void insert_applet_away();
+extern void remove_applet_away();
 
-void update_pixmaps();
-void applet_set_tooltips(char *);
+extern void update_pixmaps();
+extern void applet_set_tooltips(char *);
+extern void dologin(GtkWidget *, GtkWidget *);
 
 #endif /*USE_APPLET*/
 #endif /*_GAIMGNOMEAPPLETMGR_H_*/
--- a/src/oscar.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/oscar.c	Thu Jun 15 05:27:25 2000 +0000
@@ -350,6 +350,7 @@
 	aim_bos_ackrateresp(sess, command->conn);
 	aim_chat_clientready(sess, command->conn);
 	serv_got_joined_chat(id++, aim_chat_getname(command->conn));
+	return 1;
 }
 
 extern void gaim_setup();
@@ -363,8 +364,6 @@
 	char *ip;
 	char *cookie;
 
-	char buddies[BUF_LONG];
-
 	va_start(ap, command);
 	serviceid = va_arg(ap, int);
 	ip        = va_arg(ap, char *);
--- a/src/prefs.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/prefs.c	Thu Jun 15 05:27:25 2000 +0000
@@ -34,6 +34,7 @@
 #include <gtk/gtk.h>
 #include "gaim.h"
 #include "proxy.h"
+#include "gnome_applet_mgr.h"
 
 struct prefs_data *pd = NULL;
 struct debug_window *dw = NULL;
@@ -211,6 +212,7 @@
 	return TRUE;
 }
 
+#ifndef USE_OSCAR
 static int
 connection_key_pressed(GtkWidget *w, GdkEvent *event, void *dummy)
 {
@@ -226,6 +228,7 @@
 	save_prefs();
 	return TRUE;
 }
+#endif
 
 
 
@@ -305,8 +308,6 @@
 {
 	GtkWidget *bbox;
 	GtkWidget *vbox;
-	GtkWidget *hbox;
-        GtkWidget *hbox2;
         GtkWidget *idlebox;
         GtkWidget *idleframe;
         GtkWidget *genbox;
@@ -328,6 +329,9 @@
 #ifndef USE_OSCAR /* sorry, since we don't control the comm we can't set
 		     the connection */
         GtkWidget *connection_page;
+        GtkWidget *connectopt;
+	GtkWidget *hbox;
+        GtkWidget *hbox2;
 #endif
 #ifdef USE_APPLET
 	GtkWidget *applet_page;
@@ -335,7 +339,6 @@
 #endif
         GtkWidget *label;
         GtkWidget *browseropt;
-        GtkWidget *connectopt;
         GtkWidget *idleopt;
 	        
         GList *awy = away_messages;
--- a/src/rvous.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/rvous.c	Thu Jun 15 05:27:25 2000 +0000
@@ -212,7 +212,6 @@
 	struct file_header header;
 	int read_rv;
 	guint32 rcv;
-        char *c;
 	int cont = 1;
 	GtkWidget *fw = NULL, *fbar = NULL, *label = NULL;
 	GtkWidget *button = NULL, *pct = NULL;
@@ -421,7 +420,7 @@
 	aol_icon(fw->window);
 	gtk_widget_show(fw);
 
-	sprintf(debug_buff, "Sending %s to %s (%d bytes)\n", fhdr.name,
+	sprintf(debug_buff, "Sending %s to %s (%ld bytes)\n", fhdr.name,
 			ft->user, fhdr.totsize);
 	debug_print(debug_buff);
 
@@ -478,9 +477,7 @@
 	char *buf2;
 	int read_rv;
 	struct file_header fhdr;
-	struct sockaddr_in sin;
-	guint32 rcv;
-	int cont;
+	guint32 rcv = 0;
 	char *c;
 	struct stat st;
 	struct tm *fortime;
@@ -590,7 +587,7 @@
 			fortime->tm_mon + 1, fortime->tm_mday, fortime->tm_year + 1900,
 			fortime->tm_hour + 1, fortime->tm_min + 1,
 			st.st_size, c);
-	sprintf(debug_buff, "Sending listing.txt (%ld bytes) to %s\n",
+	sprintf(debug_buff, "Sending listing.txt (%d bytes) to %s\n",
 			ntohl(fhdr.size) + 1, ft->user);
 	debug_print(debug_buff);
 
--- a/src/server.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/server.c	Thu Jun 15 05:27:25 2000 +0000
@@ -186,7 +186,6 @@
 void serv_get_away_msg(char *name)
 {
 #ifndef USE_OSCAR
-	char buf[MSG_LEN];
 	/* HAHA! TOC doesn't have this yet */
 #else
 	aim_getinfo(gaim_sess, gaim_conn, name, AIM_GETINFO_AWAYMESSAGE);
@@ -319,7 +318,8 @@
 			aim_bos_setbuddylist(gaim_sess, gaim_conn, buf);
 			n = 0;
 		}
-		n += g_snprintf(buf + n, sizeof(buf) - n, "%s&", buddies->data);
+		n += g_snprintf(buf + n, sizeof(buf) - n, "%s&",
+				(char *)buddies->data);
 		buddies = buddies->next;
 	}
 	aim_bos_setbuddylist(gaim_sess, gaim_conn, buf);
@@ -423,7 +423,7 @@
 		}
 		while (list) {
 			at += g_snprintf(&buf[at], sizeof(buf) - at, "%s&",
-					list->data);
+					(char *)list->data);
 			list = list->next;
 		}
 		aim_bos_changevisibility(gaim_sess, gaim_conn,
@@ -433,7 +433,7 @@
 		if (list == NULL) return;
 		while (list) {
 			at += g_snprintf(&buf[at], sizeof(buf) - at, "%s&",
-					list->data);
+					(char *)list->data);
 			list = list->next;
 		}
 		aim_bos_changevisibility(gaim_sess, gaim_conn,