Mercurial > pidgin
changeset 3716:d7e83b4db191
[gaim-migrate @ 3849]
Warning fixes
committer: Tailor Script <tailor@pidgin.im>
| author | Herman Bloggs <hermanator12002@yahoo.com> |
|---|---|
| date | Wed, 16 Oct 2002 19:44:19 +0000 |
| parents | 764d6f1848b2 |
| children | 988485669631 |
| files | src/aim.c src/buddy.c src/buddy_chat.c src/conversation.c src/convo.h src/core.c src/dialogs.c src/ft.c |
| diffstat | 8 files changed, 42 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aim.c Wed Oct 16 19:40:00 2002 +0000 +++ b/src/aim.c Wed Oct 16 19:44:19 2002 +0000 @@ -28,9 +28,7 @@ #endif #endif /* GAIM_PLUGINS */ #include <gtk/gtk.h> -#ifdef _WIN32 -#include <winsock.h> -#else +#ifndef _WIN32 #include <gdk/gdkx.h> #include <unistd.h> #include <sys/socket.h> @@ -38,7 +36,7 @@ #include <arpa/inet.h> #include <sys/un.h> #include <sys/wait.h> -#endif /* _WIN32 */ +#endif /* !_WIN32 */ #include <gdk/gdk.h> #include <sys/types.h> #include <sys/stat.h> @@ -50,19 +48,21 @@ #include <ctype.h> #include "prpl.h" #include "gaim.h" -#include "pixmaps/logo.xpm" #if HAVE_SIGNAL_H #include <signal.h> #endif #include "locale.h" #include "gtkspell.h" #include <getopt.h> + #ifdef _WIN32 #include "win32dep.h" #endif +#ifndef _WIN32 static gchar *aspell_cmd[] = { "aspell", "--sug-mode=fast","-a", NULL }; static gchar *ispell_cmd[] = { "ispell", "-a", NULL }; +#endif static GtkWidget *name; static GtkWidget *pass; @@ -165,7 +165,7 @@ save_prefs(); serv_login(u); } - +#if 0 static void dologin_all(GtkWidget *widget, GtkWidget *w) { struct aim_user *u; @@ -178,7 +178,7 @@ users = users->next; } } - +#endif static void doenter(GtkWidget *widget, GtkWidget *w) { if (widget == name) { @@ -507,7 +507,7 @@ debug_printf("%s - %s\n", domain, msg); g_log_default_handler(domain, flags, msg, user_data); } -#endif +#endif /* _WIN32 */ /* FUCKING GET ME A TOWEL! */ #ifdef _WIN32
--- a/src/buddy.c Wed Oct 16 19:40:00 2002 +0000 +++ b/src/buddy.c Wed Oct 16 19:44:19 2002 +0000 @@ -64,9 +64,11 @@ #include "pixmaps/add_small.xpm" #include "pixmaps/import_small.xpm" /*#include "pixmaps/export_small.xpm"*/ +#if 0 #if defined(GAIM_PLUGINS) || defined(USE_PERL) #include "pixmaps/plugins_small.xpm" #endif +#endif #include "pixmaps/prefs_small.xpm" #include "pixmaps/search_small.xpm" #include "pixmaps/close_small.xpm" @@ -2572,9 +2574,6 @@ GtkWidget *sw; GtkWidget *menu; -#ifdef USE_PERL - GtkWidget *perlmenu; -#endif #ifdef NO_MULTI GtkWidget *setmenu; GtkWidget *findmenu;
--- a/src/buddy_chat.c Wed Oct 16 19:40:00 2002 +0000 +++ b/src/buddy_chat.c Wed Oct 16 19:44:19 2002 +0000 @@ -36,9 +36,16 @@ #include "convo.h" #include "prpl.h" -#include "pixmaps/tb_forward.xpm" +/*#include "pixmaps/tb_forward.xpm"*/ #include "pixmaps/join.xpm" -#include "pixmaps/close.xpm" +/*#include "pixmaps/close.xpm"*/ +#include "pixmaps/cancel.xpm" +#include "pixmaps/tmp_send.xpm" +#include "pixmaps/gnome_add.xpm" +#include "pixmaps/gnome_remove.xpm" +#include "pixmaps/block.xpm" +#include "pixmaps/warn.xpm" +#include "pixmaps/tb_search.xpm" GtkWidget *joinchat; static struct gaim_connection *joinchatgc; @@ -1122,12 +1129,12 @@ GtkWidget *cont; GtkWidget *text; GtkWidget *list; - GtkWidget *close; + /*GtkWidget *close;*/ GtkWidget *chatentry; GtkWidget *lbox; GtkWidget *bbox; GtkWidget *bbox2; - GtkWidget *button, *im; + GtkWidget *button; GtkWidget *sw; GtkWidget *sw2; GtkWidget *vbox; @@ -1138,7 +1145,7 @@ char buf[BUF_LONG]; - int dispstyle = set_dispstyle(1); + /*int dispstyle = set_dispstyle(1);*/ if (chat_options & OPT_CHAT_ONE_WINDOW) { if (!all_chats) {
--- a/src/conversation.c Wed Oct 16 19:40:00 2002 +0000 +++ b/src/conversation.c Wed Oct 16 19:44:19 2002 +0000 @@ -47,10 +47,12 @@ #include "prpl.h" #ifdef _WIN32 +#include <process.h> /* fog getpid() */ +#include <io.h> #include "win32dep.h" #endif -#include "pixmaps/save_small.xpm" +/*#include "pixmaps/save_small.xpm"*/ #include "pixmaps/luke03.xpm" #include "pixmaps/oneeye.xpm" @@ -1339,15 +1341,8 @@ if (err < 0) { if (err == -E2BIG) do_error_dialog(_("Unable to send message. The message is too large"), NULL, GAIM_ERROR); -#ifndef _WIN32 else if (err == -ENOTCONN) debug_printf("Not yet connected\n"); -#else - else if (err == SOCKET_ERROR) { - if (WSAENOTCONN == WSAGetLastError()) - debug_printf("Not yet connected\n"); - } -#endif else do_error_dialog(_("Unable to send message"), NULL, GAIM_ERROR); } else { @@ -2409,7 +2404,7 @@ void update_convo_add_button(struct conversation *c) { - int dispstyle = set_dispstyle(0); + /*int dispstyle = set_dispstyle(0);*/ GtkWidget *parent = c->add->parent; gboolean rebuild = FALSE; @@ -2767,7 +2762,7 @@ GtkWidget *info; GtkWidget *warn; GtkWidget *block; - GtkWidget *close; + /*GtkWidget *close;*/ GtkWidget *entry; GtkWidget *bbox; GtkWidget *vbox;
--- a/src/convo.h Wed Oct 16 19:40:00 2002 +0000 +++ b/src/convo.h Wed Oct 16 19:44:19 2002 +0000 @@ -25,6 +25,7 @@ #include <gtk/gtk.h> #include "gaim.h" +#if 0 #include "pixmaps/tmp_send.xpm" #include "pixmaps/gnome_remove.xpm" #include "pixmaps/gnome_add.xpm" @@ -32,6 +33,7 @@ #include "pixmaps/warn.xpm" #include "pixmaps/tb_search.xpm" #include "pixmaps/block.xpm" +#endif extern GtkWidget *convo_notebook; extern GtkWidget *chat_notebook;
--- a/src/core.c Wed Oct 16 19:40:00 2002 +0000 +++ b/src/core.c Wed Oct 16 19:44:19 2002 +0000 @@ -51,7 +51,9 @@ #include "win32dep.h" #endif +#ifndef _WIN32 static gint UI_fd = -1; +#endif int gaim_session = 0; GSList *uis = NULL;
--- a/src/dialogs.c Wed Oct 16 19:40:00 2002 +0000 +++ b/src/dialogs.c Wed Oct 16 19:44:19 2002 +0000 @@ -3561,9 +3561,9 @@ GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dummy)); GValue val = { 0, }; - if (! gtk_tree_selection_get_selected (sel, &ls, &iter)) + if (! gtk_tree_selection_get_selected (sel, (GtkTreeModel**)&ls, &iter)) return; - gtk_tree_model_get_value (ls, &iter, 1, &val); + gtk_tree_model_get_value (GTK_TREE_MODEL(ls), &iter, 1, &val); amt = g_value_get_pointer (&val); gtk_entry_set_text(GTK_ENTRY(ca->entry), amt->name); gtk_editable_insert_text(GTK_EDITABLE(ca->text), amt->message, @@ -3884,7 +3884,7 @@ static void do_save_log(GtkWidget *w, GtkWidget *filesel) { - char *file; + const char *file; char path[PATHSIZE]; char buf[BUF_LONG]; char error[BUF_LEN]; @@ -3898,7 +3898,7 @@ g_snprintf(filename, PATHSIZE, "%s" G_DIR_SEPARATOR_S "logs" G_DIR_SEPARATOR_S "%s%s", tmp, name ? normalize(name) : "system", name ? ".log" : ""); - file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel)); + file = (const char*)gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel)); strncpy(path, file, PATHSIZE - 1); if (file_is_dir(path, filesel)) return; @@ -4113,7 +4113,7 @@ void chat_show_log(GtkWidget *w, gpointer data) { - char *name = g_strdup_printf("%s.chat", data); + char *name = g_strdup_printf("%s.chat", (char*)data); show_log(name); g_free(name); }
--- a/src/ft.c Wed Oct 16 19:40:00 2002 +0000 +++ b/src/ft.c Wed Oct 16 19:44:19 2002 +0000 @@ -35,6 +35,10 @@ #include "proxy.h" #include "prpl.h" +#ifdef _WIN32 +#include "win32dep.h" +#endif + /* Completely describes a file transfer. Opaque to callers. */ struct file_transfer { enum { FILE_TRANSFER_TYPE_SEND, FILE_TRANSFER_TYPE_RECEIVE } type; @@ -461,11 +465,9 @@ /* Two functions, one recursive, just to make a directory. Yuck. */ static int ft_mkdir_help(char *dir) { int ret; -#ifndef _WIN32 + ret = mkdir(dir, 0775); -#else - ret = _mkdir(dir); -#endif + if (ret) { char *index = strrchr(dir, G_DIR_SEPARATOR); if (!index) @@ -474,11 +476,7 @@ ret = ft_mkdir_help(dir); *index = G_DIR_SEPARATOR; if (!ret) -#ifndef _WIN32 ret = mkdir(dir, 0775); -#else - ret = _mkdir(dir); -#endif } return ret;