pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16448] trunk/console/gntgaim.c

[<sea...@us...>]

Revision: 16448
Author:   seanegan
Date:     2006-07-06 11:02:17 -0700 (Thu, 06 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16448&view=rev

Log Message:
-----------
unitialized variable

Modified Paths:
--------------
    trunk/console/gntgaim.c
Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c	2006-07-06 17:54:46 UTC (rev 16447)
+++ trunk/console/gntgaim.c	2006-07-06 18:02:17 UTC (rev 16448)
@@ -156,7 +156,7 @@
 	gboolean opt_version = FALSE;
 	char *opt_config_dir_arg = NULL;
 	char *opt_session_arg = NULL;
-	gboolean debug_enabled;
+	gboolean debug_enabled = FALSE;
 
 	struct option long_options[] = {
 		{"config",   required_argument, NULL, 'c'},


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16592] trunk/console/gntgaim.c

[<sa...@us...>]

Revision: 16592
Author:   sadrul
Date:     2006-07-28 16:48:26 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16592&view=rev

Log Message:
-----------
This would've caused crashes after the tree-restructuring was complete.
A lot of thanks to wabz for testing the thing, finding the bug and fixing it.

Modified Paths:
--------------
    trunk/console/gntgaim.c
Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c	2006-07-28 18:19:27 UTC (rev 16591)
+++ trunk/console/gntgaim.c	2006-07-28 23:48:26 UTC (rev 16592)
@@ -246,7 +246,11 @@
 	gaim_plugins_add_search_path(path);
 	g_free(path);
 
-	gaim_plugins_add_search_path("/usr/local/lib/gaim");	/* XXX: */
+#ifdef LIBDIR
+	gaim_plugins_add_search_path(LIBDIR);
+#else
+	gaim_plugins_add_search_path("/usr/local/lib/gaim");	/* XXX: Remove this after the restructure */
+#endif
 
 	if (!gaim_core_init(GAIM_GNT_UI))
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16609] trunk/console/gntgaim.c

[<sa...@us...>]

Revision: 16609
Author:   sadrul
Date:     2006-08-01 12:52:48 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16609&view=rev

Log Message:
-----------
Let's behave properly when someone's asking for help, ai?

Modified Paths:
--------------
    trunk/console/gntgaim.c
Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c	2006-08-01 19:34:43 UTC (rev 16608)
+++ trunk/console/gntgaim.c	2006-08-01 19:52:48 UTC (rev 16609)
@@ -140,9 +140,9 @@
 	char *text;
 
 	if (terse) {
-		text = g_strdup_printf(_("Gaim %s. Try `%s -h' for more information.\n"), VERSION, name);
+		text = g_strdup_printf(_("%s. Try `%s -h' for more information.\n"), VERSION, name);
 	} else {
-		text = g_strdup_printf(_("Gaim %s\n"
+		text = g_strdup_printf(_("%s\n"
 		       "Usage: %s [OPTION]...\n\n"
 		       "  -c, --config=DIR    use DIR for config files\n"
 		       "  -d, --debug         print debugging messages to stdout\n"
@@ -151,6 +151,7 @@
 		       "  -v, --version       display the current version and exit\n"), VERSION, name);
 	}
 
+	gnt_quit();
 	gaim_print_utf8_to_console(stdout, text);
 	g_free(text);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17478] trunk/console/gntgaim.c

[<sa...@us...>]

Revision: 17478
          http://svn.sourceforge.net/gaim/?rev=17478&view=rev
Author:   sadrul
Date:     2006-10-13 18:56:10 -0700 (Fri, 13 Oct 2006)

Log Message:
-----------
Patch from Richard Nelson (wabz) to plug a leak.

Modified Paths:
--------------
    trunk/console/gntgaim.c

Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c	2006-10-14 01:52:33 UTC (rev 17477)
+++ trunk/console/gntgaim.c	2006-10-14 01:56:10 UTC (rev 17478)
@@ -252,6 +252,7 @@
 	/* set a user-specified config directory */
 	if (opt_config_dir_arg != NULL) {
 		gaim_util_set_user_dir(opt_config_dir_arg);
+		g_free(opt_config_dir_arg);
 	}
 
 	/*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17503] trunk/console/gntgaim.c

[<sa...@us...>]

Revision: 17503
          http://svn.sourceforge.net/gaim/?rev=17503&view=rev
Author:   sadrul
Date:     2006-10-17 14:47:48 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
s/gtk/gnt/

Modified Paths:
--------------
    trunk/console/gntgaim.c

Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c	2006-10-17 21:46:09 UTC (rev 17502)
+++ trunk/console/gntgaim.c	2006-10-17 21:47:48 UTC (rev 17503)
@@ -79,12 +79,12 @@
 
 } GaimGtkIOClosure;
 
-static void gaim_gtk_io_destroy(gpointer data)
+static void gaim_gnt_io_destroy(gpointer data)
 {
 	g_free(data);
 }
 
-static gboolean gaim_gtk_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
+static gboolean gaim_gnt_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
 {
 	GaimGtkIOClosure *closure = data;
 	GaimInputCondition gaim_cond = 0;
@@ -103,7 +103,7 @@
 #ifdef _WIN32
 	if(! gaim_cond) {
 #if DEBUG
-		gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
+		gaim_debug_misc("gnt_eventloop",
 			   "CLOSURE received GIOCondition of 0x%x, which does not"
 			   " match 0x%x (READ) or 0x%x (WRITE)\n",
 			   condition, GAIM_GTK_READ_COND, GAIM_GTK_WRITE_COND);
@@ -136,7 +136,7 @@
 
 	channel = g_io_channel_unix_new(fd);
 	closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
-					      gaim_gtk_io_invoke, closure, gaim_gtk_io_destroy);
+					      gaim_gnt_io_invoke, closure, gaim_gnt_io_destroy);
 
 	g_io_channel_unref(channel);
 	return closure->result;
@@ -326,6 +326,8 @@
 	/* XXX: Don't puke */
 	freopen(".error", "w", stderr);
 
+	signal(SIGPIPE, SIG_IGN);
+
 	/* Initialize the libgaim stuff */
 	if (!init_libgaim(argc, argv))
 		return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17818] trunk/console/gntgaim.c

[<nos...@us...>]

Revision: 17818
          http://svn.sourceforge.net/gaim/?rev=17818&view=rev
Author:   nosnilmot
Date:     2006-11-25 08:47:23 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
Add fallback binary relocation support (copied from gtk gaim). This
might make Alver's IRIX build work.

Modified Paths:
--------------
    trunk/console/gntgaim.c

Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c	2006-11-23 22:35:32 UTC (rev 17817)
+++ trunk/console/gntgaim.c	2006-11-25 16:47:23 UTC (rev 17818)
@@ -27,6 +27,7 @@
 #include "ft.h"
 #include "log.h"
 #include "notify.h"
+#include "prefix.h"
 #include "prefs.h"
 #include "prpl.h"
 #include "pounce.h"
@@ -156,6 +157,66 @@
 	return &eventloop_ops;
 }
 
+/* This is copied from gtkgaim */
+static char *
+gnt_find_binary_location(void *symbol, void *data)
+{
+	static char *fullname = NULL;
+	static gboolean first = TRUE;
+
+	char *argv0 = data;
+	struct stat st;
+	char *basebuf, *linkbuf, *fullbuf;
+
+	if (!first)
+		/* We've already been through this. */
+		return strdup(fullname);
+
+	first = FALSE;
+
+	if (!argv0)
+		return NULL;
+
+
+	basebuf = g_find_program_in_path(argv0);
+
+	/* But we still need to deal with symbolic links */
+	g_lstat(basebuf, &st);
+	while ((st.st_mode & S_IFLNK) == S_IFLNK) {
+		int written;
+		linkbuf = g_malloc(1024);
+		written = readlink(basebuf, linkbuf, 1024 - 1);
+		if (written == -1)
+		{
+			/* This really shouldn't happen, but do we
+			 * need something better here? */
+			g_free(linkbuf);
+			continue;
+		}
+		linkbuf[written] = '\0';
+		if (linkbuf[0] == G_DIR_SEPARATOR) {
+			/* an absolute path */
+			fullbuf = g_strdup(linkbuf);
+		} else {
+			char *dirbuf = g_path_get_dirname(basebuf);
+			/* a relative path */
+			fullbuf = g_strdup_printf("%s%s%s",
+					dirbuf, G_DIR_SEPARATOR_S,
+					linkbuf);
+			g_free(dirbuf);
+		}
+		/* There's no memory leak here.  Really! */
+		g_free(linkbuf);
+		g_free(basebuf);
+		basebuf = fullbuf;
+		g_lstat(basebuf, &st);
+	}
+
+	fullname = basebuf;
+	return strdup(fullname);
+}
+
+
 /* This is mostly copied from gtkgaim's source tree */
 static void
 show_usage(const char *name, gboolean terse)
@@ -200,6 +261,8 @@
 		{0, 0, 0, 0}
 	};
 
+	gaim_br_set_locate_fallback_func(gnt_find_binary_location, argv[0]);
+
 	/* scan command-line options */
 	opterr = 1;
 	while ((opt = getopt_long(argc, argv,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17819] trunk/console/gntgaim.c

[<nos...@us...>]

Revision: 17819
          http://svn.sourceforge.net/gaim/?rev=17819&view=rev
Author:   nosnilmot
Date:     2006-11-25 09:49:23 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
i18n support for gaim-text

Modified Paths:
--------------
    trunk/console/gntgaim.c

Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c	2006-11-25 16:47:23 UTC (rev 17818)
+++ trunk/console/gntgaim.c	2006-11-25 17:49:23 UTC (rev 17819)
@@ -263,6 +263,16 @@
 
 	gaim_br_set_locate_fallback_func(gnt_find_binary_location, argv[0]);
 
+#ifdef ENABLE_NLS
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset(PACKAGE, "UTF-8");
+	textdomain(PACKAGE);
+#endif
+
+#ifdef HAVE_SETLOCALE
+	setlocale(LC_ALL, "");
+#endif
+
 	/* scan command-line options */
 	opterr = 1;
 	while ((opt = getopt_long(argc, argv,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.