Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv19832/src
Modified Files:
aim.c Makefile.am core.c gaim-remote.c
Log Message:
An automake fix, and a fix for an incredibly blatant Linuxism.
Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- aim.c 17 Sep 2002 16:01:55 -0000 1.199
+++ aim.c 18 Sep 2002 00:11:44 -0000 1.200
@@ -481,25 +481,6 @@
return TRUE;
}
-static int open_socket(char *name)
-{
- struct sockaddr_un saddr;
- gint fd;
-
- if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) != -1) {
- saddr.sun_family = AF_UNIX;
- g_snprintf(saddr.sun_path, 108, "%s", name);
- if (connect(fd, (struct sockaddr *)&saddr, sizeof(saddr)) != -1)
- return fd;
- else
- debug_printf("Failed to assign %s to a socket (Error: %s)\n",
- saddr.sun_path, strerror(errno));
- } else
- debug_printf("Unable to open socket: %s\n", strerror(errno));
- close(fd);
- return -1;
-}
-
static int ui_main()
{
GIOChannel *channel;
@@ -520,7 +501,7 @@
g_snprintf(name, sizeof(name), "%s/gaim_%s.%d", g_get_tmp_dir(), g_get_user_name(), gaim_session);
- UI_fd = open_socket(name);
+ UI_fd = gaim_connect_to_session(0);
if (UI_fd < 0)
return 1;
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile.am 30 Aug 2002 20:57:22 -0000 1.51
+++ Makefile.am 18 Sep 2002 00:11:44 -0000 1.52
@@ -32,6 +32,7 @@
gaim_LDFLAGS = -export-dynamic
gaim_LDADD = @LDADD@ @LIBOBJS@
+gaim_LDADD = @LDADD@ @LIBOBJS@
gaim_remote_SOURCES = gaim-remote.c socket.c
CFLAGS += $(PERL_CFLAGS)
Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- core.c 30 Aug 2002 16:09:22 -0000 1.21
+++ core.c 18 Sep 2002 00:11:45 -0000 1.22
@@ -443,7 +443,7 @@
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) != -1) {
mode_t m = umask(0177);
saddr.sun_family = AF_UNIX;
- g_snprintf(saddr.sun_path, 108, "%s/gaim_%s.%d",
+ g_snprintf(saddr.sun_path, sizeof(saddr.sun_path), "%s/gaim_%s.%d",
g_get_tmp_dir(), g_get_user_name(), gaim_session);
if (bind(fd, (struct sockaddr *)&saddr, sizeof(saddr)) != -1)
listen(fd, 100);
Index: gaim-remote.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim-remote.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gaim-remote.c 30 Aug 2002 16:28:00 -0000 1.1
+++ gaim-remote.c 18 Sep 2002 00:11:45 -0000 1.2
@@ -20,7 +20,7 @@
*/
#include "gaim.h"
-#include "getopt.h"
+#include <getopt.h>
#include "gaim-socket.h"
void show_remote_usage(char *name)
|
