pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] SF.net SVN: gaim: [16595] web/htdocs/summerofcode/index.php

[<the...@us...>]

Revision: 16595
Author:   thekingant
Date:     2006-07-29 08:42:32 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16595&view=rev

Log Message:
-----------
No summer of code blogs this a?\195?\177o

Modified Paths:
--------------
    web/htdocs/summerofcode/index.php
Modified: web/htdocs/summerofcode/index.php
===================================================================
--- web/htdocs/summerofcode/index.php	2006-07-29 09:39:43 UTC (rev 16594)
+++ web/htdocs/summerofcode/index.php	2006-07-29 15:42:32 UTC (rev 16595)
@@ -6,7 +6,7 @@
 <i>For information about Summer of Code 2005, see <a href='2005.html'>last year's page</a></i>.
 
 <h1>Contents</h1>
-<ul><li><em><a href="planet">Planet Summer of Gaim</a></em></li>
+<ul>
     <li><a href="#news">News</a></li>
     <li><a href="#intro">Introduction</a></li>
     <li><a href="#accepted">Accepted projects</a></li>


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

[Gaim-commits] SF.net SVN: gaim: [16594] trunk/console/gntconv.c

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

Revision: 16594
Author:   sadrul
Date:     2006-07-29 02:39:43 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16594&view=rev

Log Message:
-----------
Enhancement patch from wabz (Richard Nelson) to show the title of the
conversation, and to show the alias of the buddy in the conversation if set.

Modified Paths:
--------------
    trunk/console/gntconv.c
Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c	2006-07-29 05:36:23 UTC (rev 16593)
+++ trunk/console/gntconv.c	2006-07-29 09:39:43 UTC (rev 16594)
@@ -162,7 +162,7 @@
 	conv->ui_data = ggc;
 
 	type = gaim_conversation_get_type(conv);
-	title = g_strdup_printf(_("%s"), gaim_conversation_get_name(conv));
+	title = g_strdup_printf(_("%s"), gaim_conversation_get_title(conv));
 	ggc->window = gnt_box_new(FALSE, TRUE);
 	gnt_box_set_title(GNT_BOX(ggc->window), title);
 	gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE);
@@ -244,9 +244,9 @@
 gg_write_im(GaimConversation *conv, const char *who, const char *message,
 		GaimMessageFlags flags, time_t mtime)
 {
+	GaimAccount *account = gaim_conversation_get_account(conv);
 	if (flags & GAIM_MESSAGE_SEND)
 	{
-		GaimAccount *account = gaim_conversation_get_account(conv);
 		who = gaim_connection_get_display_name(gaim_account_get_connection(account));
 		if (!who)
 			who = gaim_account_get_alias(account);
@@ -254,7 +254,13 @@
 			who = gaim_account_get_username(account);
 	}
 	else if (flags & GAIM_MESSAGE_RECV)
+	{
+		GaimBuddy *buddy;
 		who = gaim_conversation_get_name(conv);
+		buddy = gaim_find_buddy(account, who);
+		if (buddy)
+			who = gaim_buddy_get_contact_alias(buddy);
+	}
 
 	gg_write_common(conv, who, message, flags, mtime);
 }


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

[Gaim-commits] SF.net SVN: gaim: [16593] branches/v2_0_0

[<rl...@us...>]

Revision: 16593
Author:   rlaager
Date:     2006-07-28 22:36:23 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16593&view=rev

Log Message:
-----------
Merge the time_t -> struct tm changes from trunk into v2_0_0.

Modified Paths:
--------------
    branches/v2_0_0/configure.ac
    branches/v2_0_0/doc/gtkconv-signals.dox
    branches/v2_0_0/doc/log-signals.dox
    branches/v2_0_0/plugins/timestamp_format.c
    branches/v2_0_0/src/gtkconv.c
    branches/v2_0_0/src/log.c
    branches/v2_0_0/src/signals.c
    branches/v2_0_0/src/signals.h
    branches/v2_0_0/src/value.h
Modified: branches/v2_0_0/configure.ac
===================================================================
--- branches/v2_0_0/configure.ac	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/configure.ac	2006-07-29 05:36:23 UTC (rev 16593)
@@ -60,6 +60,9 @@
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_STRUCT_TM
+AC_CHECK_SIZEOF(time_t, ,[
+#include <stdio.h>
+#include <time.h>])
 
 AC_C_BIGENDIAN
 

Modified: branches/v2_0_0/doc/gtkconv-signals.dox
===================================================================
--- branches/v2_0_0/doc/gtkconv-signals.dox	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/doc/gtkconv-signals.dox	2006-07-29 05:36:23 UTC (rev 16593)
@@ -24,12 +24,12 @@
 
  @signaldef conversation-timestamp
   @signalproto
-char *(*conversation_timestamp)(GaimConversation *conv, struct tm *tm);
+char *(*conversation_timestamp)(GaimConversation *conv, time_t when);
   @endsignalproto
   @signaldesc
    Emitted to allow plugins to customize the timestamp on a message.
   @param conv The conversation the message belongs to.
-  @param tm The time to be converted to a string.
+  @param when The time to be converted to a string.
   @return A textual representation of the time, or @c NULL to use a
           default format.
  @endsignaldef

Modified: branches/v2_0_0/doc/log-signals.dox
===================================================================
--- branches/v2_0_0/doc/log-signals.dox	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/doc/log-signals.dox	2006-07-29 05:36:23 UTC (rev 16593)
@@ -8,13 +8,13 @@
 
  @signaldef log-timestamp
   @signalproto
-char *(*log_timestamp)(GaimConversation *conv, struct tm *tm);
+char *(*log_timestamp)(GaimConversation *conv, time_t when);
   @endsignalproto
   @signaldesc
    Emitted to allow plugins to customize the timestamp on a message
    being logged.
   @param log The log the message belongs to.
-  @param tm The time to be converted to a string.
+  @param when The time to be converted to a string.
   @return A textual representation of the time, or @c NULL to use a
           default format.
   @note Plugins must be careful of logs with a type of GAIM_LOG_SYSTEM.

Modified: branches/v2_0_0/plugins/timestamp_format.c
===================================================================
--- branches/v2_0_0/plugins/timestamp_format.c	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/plugins/timestamp_format.c	2006-07-29 05:36:23 UTC (rev 16593)
@@ -52,18 +52,18 @@
 }
 
 static char *timestamp_cb_common(GaimConversation *conv,
-                                 const struct tm *tm,
+                                 time_t t,
                                  gboolean force,
                                  const char *dates)
 {
+	struct tm *tm = localtime(&t);
 	g_return_val_if_fail(conv != NULL, NULL);
-	g_return_val_if_fail(tm != NULL, NULL);
 	g_return_val_if_fail(dates != NULL, NULL);
 
 	if (!strcmp(dates, "always") ||
 	    (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT &&
 	     !strcmp(dates, "chats")) ||
-	    (time(NULL) > (mktime((struct tm *)tm) + 20*60)))
+	    (time(NULL) > (mktime(tm) + 20*60)))
 	{
 		if (force)
 			return g_strdup(gaim_utf8_strftime("%Y-%m-%d %H:%M:%S", tm));
@@ -78,7 +78,7 @@
 }
 
 static char *conversation_timestamp_cb(GaimConversation *conv,
-                                       const struct tm *tm, gpointer data)
+                                       time_t t, gpointer data)
 {
 	gboolean force = gaim_prefs_get_bool(
 				"/plugins/gtk/timestamp_format/force_24hr");
@@ -86,13 +86,11 @@
 				"/plugins/gtk/timestamp_format/use_dates/conversation");
 
 	g_return_val_if_fail(conv != NULL, NULL);
-	g_return_val_if_fail(tm != NULL, NULL);
 
-	return timestamp_cb_common(conv, tm, force, dates);
+	return timestamp_cb_common(conv, t, force, dates);
 }
 
-static char *log_timestamp_cb(GaimLog *log,
-                                  const struct tm *tm, gpointer data)
+static char *log_timestamp_cb(GaimLog *log, time_t t, gpointer data)
 {
 	gboolean force = gaim_prefs_get_bool(
 				"/plugins/gtk/timestamp_format/force_24hr");
@@ -100,17 +98,18 @@
 				"/plugins/gtk/timestamp_format/use_dates/log");
 
 	g_return_val_if_fail(log != NULL, NULL);
-	g_return_val_if_fail(tm != NULL, NULL);
 
 	if (log->type == GAIM_LOG_SYSTEM)
 	{
-		if (force)
+		if (force) {
+			struct tm *tm = localtime(&t);
 			return g_strdup(gaim_utf8_strftime("%Y-%m-%d %H:%M:%S", tm));
-		else
+		} else {
 			return NULL;
+		}
 	}
 
-	return timestamp_cb_common(log->conv, tm, force, dates);
+	return timestamp_cb_common(log->conv, t, force, dates);
 }
 
 static gboolean

Modified: branches/v2_0_0/src/gtkconv.c
===================================================================
--- branches/v2_0_0/src/gtkconv.c	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/src/gtkconv.c	2006-07-29 05:36:23 UTC (rev 16593)
@@ -4591,7 +4591,6 @@
 	GaimConversationType type;
 	char *displaying;
 	gboolean plugin_return;
-	struct tm tm;
 
 	g_return_if_fail(conv != NULL);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
@@ -4676,16 +4675,16 @@
 	if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", gtk_font_options_all);
 
-	tm = *(localtime(&mtime));
 	mdate = gaim_signal_emit_return_1(gaim_gtk_conversations_get_handle(),
 	                                  "conversation-timestamp",
-	                                  conv, &tm);
+	                                  conv, mtime);
 	if (mdate == NULL)
 	{
+		struct tm *tm = localtime(&mtime);
 		if (time(NULL) > mtime + 20*60) /* show date if older than 20 minutes */
-			mdate = g_strdup(gaim_date_format_long(&tm));
+			mdate = g_strdup(gaim_date_format_long(tm));
 		else
-			mdate = g_strdup(gaim_time_format(&tm));
+			mdate = g_strdup(gaim_time_format(tm));
 	}
 
 	sml_attrib = g_strdup_printf("sml=\"%s\"", gaim_account_get_protocol_name(account));
@@ -6450,11 +6449,23 @@
 	                                    "GaimGtkWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
-	                     gaim_marshal_POINTER__POINTER_POINTER,
+#if SIZEOF_TIME_T == 4
+	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+# error Unknown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
-	                                    GAIM_SUBTYPE_CONVERSATION),
-	                     gaim_value_new(GAIM_TYPE_POINTER));
+	                                    GAIM_SUBTYPE_LOG),
+#if SIZEOF_TIME_T == 4
+	                     gaim_value_new(GAIM_TYPE_INT));
+#elif SIZEOF_TIME_T == 8
+	                     gaim_value_new(GAIM_TYPE_INT64));
+#else
+# error Unknown size of time_t
+#endif
 
 	gaim_signal_register(handle, "displaying-im-msg",
 						 gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,

Modified: branches/v2_0_0/src/log.c
===================================================================
--- branches/v2_0_0/src/log.c	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/src/log.c	2006-07-29 05:36:23 UTC (rev 16593)
@@ -593,12 +593,23 @@
 	gaim_log_logger_add(old_logger);
 
 	gaim_signal_register(handle, "log-timestamp",
-	                     gaim_marshal_POINTER__POINTER_POINTER,
+#if SIZEOF_TIME_T == 4
+	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+# error Unknown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),
-	                     gaim_value_new(GAIM_TYPE_BOXED,
-	                                    "struct tm *"));
+#if SIZEOF_TIME_T == 4
+	                     gaim_value_new(GAIM_TYPE_INT));
+#elif SIZEOF_TIME_T == 8
+	                     gaim_value_new(GAIM_TYPE_INT64));
+#else
+# error Unknown size of time_t
+#endif
 
 	gaim_prefs_connect_callback(NULL, "/core/logging/format",
 							    logger_pref_cb, NULL);
@@ -622,14 +633,15 @@
 static char *log_get_timestamp(GaimLog *log, time_t when)
 {
 	char *date;
-	struct tm tm = *(localtime(&when));
+	struct tm tm;
 
 	date = gaim_signal_emit_return_1(gaim_log_get_handle(),
 	                          "log-timestamp",
-	                          log, &tm);
+	                          log, when);
 	if (date != NULL)
 		return date;
 
+	tm = *(localtime(&when));
 	if (log->type == GAIM_LOG_SYSTEM || time(NULL) > when + 20*60)
 		return g_strdup(gaim_date_format_long(&tm));
 	else

Modified: branches/v2_0_0/src/signals.c
===================================================================
--- branches/v2_0_0/src/signals.c	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/src/signals.c	2006-07-29 05:36:23 UTC (rev 16593)
@@ -955,6 +955,36 @@
 }
 
 void
+gaim_marshal_POINTER__POINTER_INT(
+                                    GaimCallback cb, va_list args, void *data,
+                                    void **return_val)
+{
+	gpointer ret_val;
+	void *arg1 = va_arg(args, void *);
+	gint arg2 = va_arg(args, gint);
+
+	ret_val = ((gpointer(*)(void *, gint, void *))cb)(arg1, arg2, data);
+
+	if (return_val != NULL)
+		*return_val = ret_val;
+}
+
+void
+gaim_marshal_POINTER__POINTER_INT64(
+                                    GaimCallback cb, va_list args, void *data,
+                                    void **return_val)
+{
+	gpointer ret_val;
+	void *arg1 = va_arg(args, void *);
+	gint64 arg2 = va_arg(args, gint64);
+
+	ret_val = ((gpointer(*)(void *, gint64, void *))cb)(arg1, arg2, data);
+
+	if (return_val != NULL)
+		*return_val = ret_val;
+}
+
+void
 gaim_marshal_POINTER__POINTER_POINTER(GaimCallback cb, va_list args, void *data,
                                       void **return_val)
 {

Modified: branches/v2_0_0/src/signals.h
===================================================================
--- branches/v2_0_0/src/signals.h	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/src/signals.h	2006-07-29 05:36:23 UTC (rev 16593)
@@ -327,6 +327,10 @@
 void gaim_marshal_BOOLEAN__INT_POINTER(
 		GaimCallback cb, va_list args, void *data, void **return_val);
 
+void gaim_marshal_POINTER__POINTER_INT(
+		GaimCallback cb, va_list args, void *data, void **return_val);
+void gaim_marshal_POINTER__POINTER_INT64(
+		GaimCallback cb, va_list args, void *data, void **return_val);
 void gaim_marshal_POINTER__POINTER_POINTER(
 		GaimCallback cb, va_list args, void *data, void **return_val);
 /*@}*/

Modified: branches/v2_0_0/src/value.h
===================================================================
--- branches/v2_0_0/src/value.h	2006-07-28 23:48:26 UTC (rev 16592)
+++ branches/v2_0_0/src/value.h	2006-07-29 05:36:23 UTC (rev 16593)
@@ -53,6 +53,7 @@
 
 } GaimType;
 
+
 /**
  * Gaim-specific subtype values.
  */


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: [16591] trunk/src/log.c

[<rl...@us...>]

Revision: 16591
Author:   rlaager
Date:     2006-07-28 11:19:27 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16591&view=rev

Log Message:
-----------
(13:18:54) chaosite: rlaager: you fixed gconv.c, but not log.c =) Line 609, exact same error.

Modified Paths:
--------------
    trunk/src/log.c
Modified: trunk/src/log.c
===================================================================
--- trunk/src/log.c	2006-07-28 12:19:56 UTC (rev 16590)
+++ trunk/src/log.c	2006-07-28 18:19:27 UTC (rev 16591)
@@ -606,7 +606,7 @@
 	                                    GAIM_SUBTYPE_LOG),
 #if SIZEOF_TIME_T == 4
 	                     gaim_value_new(GAIM_TYPE_INT));
-#elif SIZE_OF_TIME_T == 8
+#elif SIZEOF_TIME_T == 8
 	                     gaim_value_new(GAIM_TYPE_INT64));
 #else
 # error Unknown size of time_t


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

[Gaim-commits] SF.net SVN: gaim: [16590] trunk/src/gtkconv.c

[<rl...@us...>]

Revision: 16590
Author:   rlaager
Date:     2006-07-28 05:19:56 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16590&view=rev

Log Message:
-----------
(03:00:12) chaosite: SIZE_OF_TIME_T in gtkconv.c:6533 as well
(03:08:48) chaosite: rlaager: ping
(03:09:22) chaosite: rlaager: svn says that SIZE_OF_TIME_T in log.c:609 is your commit
(03:09:31) chaosite: rlaager: it should be SIZEOF_TIME_T

Modified Paths:
--------------
    trunk/src/gtkconv.c
Modified: trunk/src/gtkconv.c
===================================================================
--- trunk/src/gtkconv.c	2006-07-28 04:47:19 UTC (rev 16589)
+++ trunk/src/gtkconv.c	2006-07-28 12:19:56 UTC (rev 16590)
@@ -6530,7 +6530,7 @@
 	                                    GAIM_SUBTYPE_LOG),
 #if SIZEOF_TIME_T == 4
 	                     gaim_value_new(GAIM_TYPE_INT));
-#elif SIZE_OF_TIME_T == 8
+#elif SIZEOF_TIME_T == 8
 	                     gaim_value_new(GAIM_TYPE_INT64));
 #else
 # error Unknown size of time_t


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

[Gaim-commits] SF.net SVN: gaim: [16579] branches/v2_0_0/src/win32/win32dep.c

[<amc...@us...>]

Revision: 16579
Author:   amc_grim
Date:     2006-07-25 20:52:47 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16579&view=rev

Log Message:
-----------
Patch from Kevin Stange ...

Kevin Stange: removes a useless gtk related extern.

I forgot to mention, was ANYONE aware that sourceforge passwords expire...?

Modified Paths:
--------------
    branches/v2_0_0/src/win32/win32dep.c
Modified: branches/v2_0_0/src/win32/win32dep.c
===================================================================
--- branches/v2_0_0/src/win32/win32dep.c	2006-07-26 03:51:39 UTC (rev 16578)
+++ branches/v2_0_0/src/win32/win32dep.c	2006-07-26 03:52:47 UTC (rev 16579)
@@ -74,7 +74,6 @@
  */
 
 FARPROC wgaim_find_and_loadproc(char*, char*);
-extern void wgaim_gtkspell_init();
 char* wgaim_data_dir(void);
 
 /*


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

[Gaim-commits] SF.net SVN: gaim: [16589] trunk/console/libgnt

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

Revision: 16589
Author:   sadrul
Date:     2006-07-27 21:47:19 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16589&view=rev

Log Message:
-----------
Add a configure file (~/.gntrc) for gnt to configure its looks. This
is available only for GLib 2.6 and above. Currently, it only allows
changing the colors (r;g;b -- each in [0, 1000]) and color-groups. I
have added gntrc.sample as an example.

Modified Paths:
--------------
    trunk/console/libgnt/Makefile.am
    trunk/console/libgnt/gntcolors.c
    trunk/console/libgnt/gntcolors.h
    trunk/console/libgnt/gntmain.c

Added Paths:
-----------
    trunk/console/libgnt/gntrc.sample
    trunk/console/libgnt/gntstyle.c
    trunk/console/libgnt/gntstyle.h
Modified: trunk/console/libgnt/Makefile.am
===================================================================
--- trunk/console/libgnt/Makefile.am	2006-07-27 20:11:55 UTC (rev 16588)
+++ trunk/console/libgnt/Makefile.am	2006-07-28 04:47:19 UTC (rev 16589)
@@ -14,6 +14,7 @@
 	gntlabel.c \
 	gntline.c \
 	gntmarshal.c \
+	gntstyle.c \
 	gnttextview.c \
 	gnttree.c \
 	gntmain.c
@@ -30,6 +31,7 @@
 	gntlabel.h \
 	gntline.h \
 	gntmarshal.h \
+	gntstyle.h \
 	gnttextview.h \
 	gnttree.h \
 	gnt.h

Modified: trunk/console/libgnt/gntcolors.c
===================================================================
--- trunk/console/libgnt/gntcolors.c	2006-07-27 20:11:55 UTC (rev 16588)
+++ trunk/console/libgnt/gntcolors.c	2006-07-28 04:47:19 UTC (rev 16589)
@@ -1,6 +1,11 @@
 #include <ncursesw/ncurses.h>
 #include "gntcolors.h"
 
+#include <glib.h>
+
+#include <stdlib.h>
+#include <string.h>
+
 static struct
 {
 	short r, g, b;
@@ -75,3 +80,125 @@
 	restore_colors();
 }
 
+static int
+get_color(char *key)
+{
+	int color;
+
+	key = g_strstrip(key);
+
+	if (strcmp(key, "black") == 0)
+		color = GNT_COLOR_BLACK;
+	else if (strcmp(key, "red") == 0)
+		color = GNT_COLOR_RED;
+	else if (strcmp(key, "green") == 0)
+		color = GNT_COLOR_GREEN;
+	else if (strcmp(key, "blue") == 0)
+		color = GNT_COLOR_BLUE;
+	else if (strcmp(key, "white") == 0)
+		color = GNT_COLOR_WHITE;
+	else if (strcmp(key, "gray") == 0)
+		color = GNT_COLOR_GRAY;
+	else if (strcmp(key, "darkgray") == 0)
+		color = GNT_COLOR_DARK_GRAY;
+	else
+		color = -1;
+	return color;
+}
+
+void gnt_colors_parse(GKeyFile *kfile)
+{
+	GError *error = NULL;
+	gsize nkeys;
+	char **keys = g_key_file_get_keys(kfile, "colors", &nkeys, &error);
+
+	if (error)
+	{
+		/* XXX: some error happened. */
+		g_error_free(error);
+	}
+	else
+	{
+		while (nkeys--)
+		{
+			gsize len;
+			char *key = keys[nkeys];
+			char **list = g_key_file_get_string_list(kfile, "colors", key, &len, NULL);
+			if (len == 3)
+			{
+				int r = atoi(list[0]);
+				int g = atoi(list[1]);
+				int b = atoi(list[2]);
+				int color = -1;
+
+				g_ascii_strdown(key, -1);
+				color = get_color(key);
+				if (color == -1)
+					continue;
+
+				init_color(color, r, g, b);
+			}
+			g_strfreev(list);
+		}
+
+		g_strfreev(keys);
+	}
+
+	gnt_color_pairs_parse(kfile);
+}
+
+void gnt_color_pairs_parse(GKeyFile *kfile)
+{
+	GError *error = NULL;
+	gsize nkeys;
+	char **keys = g_key_file_get_keys(kfile, "colorpairs", &nkeys, &error);
+
+	if (error)
+	{
+		/* XXX: some error happened. */
+		g_error_free(error);
+		return;
+	}
+
+	while (nkeys--)
+	{
+		gsize len;
+		char *key = keys[nkeys];
+		char **list = g_key_file_get_string_list(kfile, "colorpairs", key, &len, NULL);
+		if (len == 2)
+		{
+			GntColorType type = 0;
+			int fg = get_color(g_ascii_strdown(list[0], -1));
+			int bg = get_color(g_ascii_strdown(list[1], -1));
+			if (fg == -1 || bg == -1)
+				continue;
+
+			g_ascii_strdown(key, -1);
+
+			if (strcmp(key, "normal") == 0)
+				type = GNT_COLOR_NORMAL;
+			else if (strcmp(key, "highlight") == 0)
+				type = GNT_COLOR_HIGHLIGHT;
+			else if (strcmp(key, "highlightd") == 0)
+				type = GNT_COLOR_HIGHLIGHT_D;
+			else if (strcmp(key, "shadow") == 0)
+				type = GNT_COLOR_SHADOW;
+			else if (strcmp(key, "title") == 0)
+				type = GNT_COLOR_TITLE;
+			else if (strcmp(key, "titled") == 0)
+				type = GNT_COLOR_TITLE_D;
+			else if (strcmp(key, "text") == 0)
+				type = GNT_COLOR_TEXT_NORMAL;
+			else if (strcmp(key, "disabled") == 0)
+				type = GNT_COLOR_DISABLED;
+			else
+				continue;
+
+			init_pair(type, fg, bg);
+		}
+		g_strfreev(list);
+	}
+
+	g_strfreev(keys);
+}
+

Modified: trunk/console/libgnt/gntcolors.h
===================================================================
--- trunk/console/libgnt/gntcolors.h	2006-07-27 20:11:55 UTC (rev 16588)
+++ trunk/console/libgnt/gntcolors.h	2006-07-28 04:47:19 UTC (rev 16589)
@@ -1,6 +1,8 @@
 #ifndef GNT_COLORS_H
 #define GNT_COLORS_H
 
+#include <glib.h>
+
 typedef enum
 {
 	GNT_COLOR_NORMAL = 1,
@@ -34,4 +36,8 @@
 
 void gnt_uninit_colors();
 
+void gnt_colors_parse(GKeyFile *kfile);
+
+void gnt_color_pairs_parse(GKeyFile *kfile);
+
 #endif

Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-07-27 20:11:55 UTC (rev 16588)
+++ trunk/console/libgnt/gntmain.c	2006-07-28 04:47:19 UTC (rev 16589)
@@ -2,8 +2,9 @@
 
 #include "gnt.h"
 #include "gntbox.h"
+#include "gntcolors.h"
 #include "gntkeys.h"
-#include "gntcolors.h"
+#include "gntstyle.h"
 #include "gnttree.h"
 
 #include <stdio.h>
@@ -57,6 +58,8 @@
 
 	if (lock_focus_list)
 		return;
+	if (g_list_find(g_list_first(focus_list), widget))
+		return;
 
 	if (focus_list)
 		w = focus_list->data;
@@ -525,6 +528,7 @@
 void gnt_init()
 {
 	static GIOChannel *channel = NULL;
+	char *filename;
 	
 	if (channel)
 		return;
@@ -548,6 +552,10 @@
 	initscr();
 	gnt_init_colors();
 
+	filename = g_build_filename(g_get_home_dir(), ".gntrc", NULL);
+	gnt_style_read_configure_file(filename);
+	g_free(filename);
+
 	X_MIN = 0;
 	Y_MIN = 0;
 	X_MAX = getmaxx(stdscr);

Added: trunk/console/libgnt/gntrc.sample
===================================================================
--- trunk/console/libgnt/gntrc.sample	                        (rev 0)
+++ trunk/console/libgnt/gntrc.sample	2006-07-28 04:47:19 UTC (rev 16589)
@@ -0,0 +1,21 @@
+[general]
+shadow = 0
+
+[colors]
+black = 0; 0; 0
+red = 1000; 0; 0
+green = 0; 1000; 0
+blue = 250; 250; 700
+white = 1000; 1000; 1000
+gray = 700; 700; 700
+darkgray = 256; 256; 256
+
+[colorpairs]
+normal = black; white
+highlight = white; blue
+highlightd = black; gray
+shadow = black; darkgray
+title = white; blue
+titled = white; gray
+text = white; blue
+disabled = gray; white


Property changes on: trunk/console/libgnt/gntrc.sample
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/console/libgnt/gntstyle.c
===================================================================
--- trunk/console/libgnt/gntstyle.c	                        (rev 0)
+++ trunk/console/libgnt/gntstyle.c	2006-07-28 04:47:19 UTC (rev 16589)
@@ -0,0 +1,21 @@
+#include "gntstyle.h"
+#include "gntcolors.h"
+
+void gnt_style_read_configure_file(const char *filename)
+{
+#if GLIB_CHECK_VERSION(2,6,0)
+	GKeyFile *kfile = g_key_file_new();
+	GError *error = NULL;
+
+	if (!g_key_file_load_from_file(kfile, filename, G_KEY_FILE_NONE, &error))
+	{
+		/* XXX: Print the error or something */
+		g_error_free(error);
+		return;
+	}
+	gnt_colors_parse(kfile);
+
+	g_key_file_free(kfile);
+#endif
+}
+


Property changes on: trunk/console/libgnt/gntstyle.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/console/libgnt/gntstyle.h
===================================================================
--- trunk/console/libgnt/gntstyle.h	                        (rev 0)
+++ trunk/console/libgnt/gntstyle.h	2006-07-28 04:47:19 UTC (rev 16589)
@@ -0,0 +1,4 @@
+#include "gnt.h"
+
+void gnt_style_read_configure_file(const char *filename);
+


Property changes on: trunk/console/libgnt/gntstyle.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


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

[Gaim-commits] SF.net SVN: gaim: [16581] branches/v2_0_0/src

[<the...@us...>]

Revision: 16581
Author:   thekingant
Date:     2006-07-25 23:42:59 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16581&view=rev

Log Message:
-----------
Make v2_0_0 compile by reverting two changes Sean just made

Modified Paths:
--------------
    branches/v2_0_0/src/gtkconv.c
    branches/v2_0_0/src/log.c
Modified: branches/v2_0_0/src/gtkconv.c
===================================================================
--- branches/v2_0_0/src/gtkconv.c	2006-07-26 04:03:34 UTC (rev 16580)
+++ branches/v2_0_0/src/gtkconv.c	2006-07-26 06:42:59 UTC (rev 16581)
@@ -6450,13 +6450,7 @@
 	                                    "GaimGtkWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
-#if SIZEOF_TIME_T == 4
-	                     gaim_marshal_POINTER__POINTER_INT,
-#elif SIZEOF_TIME_T == 8
-			     gaim_marshal_POINTER__POINTER_INT64,
-#else
-#error Unkown size of time_t
-#endif
+	                     gaim_marshal_POINTER__POINTER_POINTER,
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_CONVERSATION),

Modified: branches/v2_0_0/src/log.c
===================================================================
--- branches/v2_0_0/src/log.c	2006-07-26 04:03:34 UTC (rev 16580)
+++ branches/v2_0_0/src/log.c	2006-07-26 06:42:59 UTC (rev 16581)
@@ -593,13 +593,7 @@
 	gaim_log_logger_add(old_logger);
 
 	gaim_signal_register(handle, "log-timestamp",
-#if SIZEOF_TIME_T == 4
-	                     gaim_marshal_POINTER__POINTER_INT,
-#elif SIZEOF_TIME_T == 8
-			     gaim_marshal_POINTER__POINTER_INT64,
-#else
-#error Unknown size of time_t
-#endif
+	                     gaim_marshal_POINTER__POINTER_POINTER,
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),


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

[Gaim-commits] SF.net SVN: gaim: [16588] trunk/src/protocols/gg/gg.c

[<ev...@us...>]

Revision: 16588
Author:   evands
Date:     2006-07-27 13:11:55 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16588&view=rev

Log Message:
-----------
This ggp_sr_close_cb() is no longer needed because the core handle calling the close callback as appropriate.

Modified Paths:
--------------
    trunk/src/protocols/gg/gg.c
Modified: trunk/src/protocols/gg/gg.c
===================================================================
--- trunk/src/protocols/gg/gg.c	2006-07-27 20:10:57 UTC (rev 16587)
+++ trunk/src/protocols/gg/gg.c	2006-07-27 20:11:55 UTC (rev 16588)
@@ -1160,7 +1160,6 @@
 			gaim_notify_error(gc, NULL,
 					  _("Unable to display the search results."),
 					  NULL);
-			ggp_sr_close_cb(form);
 			return;
 		}
 


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

[Gaim-commits] SF.net SVN: gaim: [16587] trunk/src/notify.c

[<ev...@us...>]

Revision: 16587
Author:   evands
Date:     2006-07-27 13:10:57 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16587&view=rev

Log Message:
-----------
Removed an unneeded return and made the notify functions call the close callback immediately if there is no appropriate ui_op.

Modified Paths:
--------------
    trunk/src/notify.c
Modified: trunk/src/notify.c
===================================================================
--- trunk/src/notify.c	2006-07-27 20:02:57 UTC (rev 16586)
+++ trunk/src/notify.c	2006-07-27 20:10:57 UTC (rev 16587)
@@ -70,7 +70,11 @@
 			g_free(info);
 
 			return NULL;
-		}		
+		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -108,8 +112,9 @@
 
 			return NULL;
 		}		
-
-		return info->ui_handle;
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -160,6 +165,10 @@
 
 			return NULL;
 		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -199,6 +208,10 @@
 			
 			return NULL;
 		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -239,7 +252,9 @@
 			return NULL;
 		}
 
-		return info->ui_handle;
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -444,6 +459,10 @@
 
 			return NULL;
 		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;


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

[Gaim-commits] SF.net SVN: gaim: [16586] trunk/src/notify.c

[<ev...@us...>]

Revision: 16586
Author:   evands
Date:     2006-07-27 13:02:57 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16586&view=rev

Log Message:
-----------
It is feasible that a UI is finished with notifying the user via the Notification API within the UI callback and has no need of a ui_handle to deal with closing the notification at a later date nor to tell the gaim core at a later point that it is finished with the data.

If the ui_op for a notification returns a ui_handle of NULL, the GaimNotifyCloseCallback (if non-NULL) is now called immediately and the info structure is freed.

If the op returns a non-NULL value, which is the case for all of gtkgaim's functions, the behavior is unchanged.

Modified Paths:
--------------
    trunk/src/notify.c
Modified: trunk/src/notify.c
===================================================================
--- trunk/src/notify.c	2006-07-27 18:58:14 UTC (rev 16585)
+++ trunk/src/notify.c	2006-07-27 20:02:57 UTC (rev 16586)
@@ -58,9 +58,19 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
+			
+			return info->ui_handle;
+			
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
 
-		return info->ui_handle;
+			g_free(info);
+
+			return NULL;
+		}		
 	}
 
 	return NULL;
@@ -85,8 +95,20 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
 
+			return info->ui_handle;
+
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+
+			g_free(info);
+
+			return NULL;
+		}		
+
 		return info->ui_handle;
 	}
 
@@ -125,9 +147,19 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
 
-		return info->ui_handle;
+			return info->ui_handle;
+
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+
+			g_free(info);
+
+			return NULL;
+		}
 	}
 
 	return NULL;
@@ -154,9 +186,19 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
-
-		return info->ui_handle;
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
+			
+			return info->ui_handle;
+			
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+			
+			g_free(info);
+			
+			return NULL;
+		}
 	}
 
 	return NULL;
@@ -183,8 +225,20 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
 
+			return info->ui_handle;
+
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+
+			g_free(info);
+
+			return NULL;
+		}
+
 		return info->ui_handle;
 	}
 
@@ -375,10 +429,21 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		g_free(infotext);
 
-		g_free(infotext);
-		return info->ui_handle;
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
+
+			return info->ui_handle;
+
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+
+			g_free(info);
+
+			return NULL;
+		}
 	}
 
 	return NULL;
@@ -401,9 +466,16 @@
 		info->handle    = handle;
 		info->ui_handle = ops->notify_uri(uri);
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
+			
+			return info->ui_handle;
 
-		return info->ui_handle;
+		} else {
+			g_free(info);
+
+			return NULL;
+		}
 	}
 
 	return NULL;


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

[Gaim-commits] SF.net SVN: gaim: [16585] trunk

[<ebl...@us...>]

Revision: 16585
Author:   eblanton
Date:     2006-07-27 11:58:14 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16585&view=rev

Log Message:
-----------
A fix for the nasty libxml corruption crash in jabber, from Henning
Nor?\195?\169n.

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/src/protocols/jabber/jabber.c
    trunk/src/protocols/jabber/jabber.h
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-07-27 18:35:16 UTC (rev 16584)
+++ trunk/COPYRIGHT	2006-07-27 18:58:14 UTC (rev 16585)
@@ -195,6 +195,7 @@
 Richard Nelson
 Dennis Nezic
 Matthew A. Nicholson
+Henning Norén
 Szilard Novaki
 Novell
 Padraig O'Briain

Modified: trunk/src/protocols/jabber/jabber.c
===================================================================
--- trunk/src/protocols/jabber/jabber.c	2006-07-27 18:35:16 UTC (rev 16584)
+++ trunk/src/protocols/jabber/jabber.c	2006-07-27 18:58:14 UTC (rev 16585)
@@ -66,6 +66,7 @@
 	/* setup the parser fresh for each stream */
 	jabber_parser_setup(js);
 	jabber_send_raw(js, open_stream, -1);
+	js->reinit = FALSE;
 	g_free(open_stream);
 }
 
@@ -354,6 +355,8 @@
 		buf[len] = '\0';
 		gaim_debug(GAIM_DEBUG_INFO, "jabber", "Recv (ssl)(%d): %s\n", len, buf);
 		jabber_parser_process(js, buf, len);
+		if(js->reinit)
+			jabber_stream_init(js);
 	}
 
 	if(errno == EAGAIN)
@@ -1009,7 +1012,7 @@
 		case JABBER_STREAM_REINITIALIZING:
 			gaim_connection_update_progress(js->gc, _("Re-initializing Stream"),
 					6, JABBER_CONNECT_STEPS);
-			jabber_stream_init(js);
+			js->reinit = TRUE;
 			break;
 		case JABBER_STREAM_CONNECTED:
 			jabber_roster_request(js);

Modified: trunk/src/protocols/jabber/jabber.h
===================================================================
--- trunk/src/protocols/jabber/jabber.h	2006-07-27 18:35:16 UTC (rev 16584)
+++ trunk/src/protocols/jabber/jabber.h	2006-07-27 18:58:14 UTC (rev 16585)
@@ -121,6 +121,8 @@
 	GaimCircBuffer *write_buffer;
 	guint writeh;
 
+	gboolean reinit;
+
 	/* OK, this stays at the end of the struct, so plugins can depend
 	 * on the rest of the stuff being in the right place
 	 */


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

[Gaim-commits] SF.net SVN: gaim: [16584] trunk/src/protocols/qq/buddy_info.c

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

Revision: 16584
Author:   seanegan
Date:     2006-07-27 11:35:16 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16584&view=rev

Log Message:
-----------
_with_data is since 2.10

Modified Paths:
--------------
    trunk/src/protocols/qq/buddy_info.c
Modified: trunk/src/protocols/qq/buddy_info.c
===================================================================
--- trunk/src/protocols/qq/buddy_info.c	2006-07-27 17:37:42 UTC (rev 16583)
+++ trunk/src/protocols/qq/buddy_info.c	2006-07-27 18:35:16 UTC (rev 16584)
@@ -205,7 +205,7 @@
 		if (g_ascii_strcasecmp(group_name, cur->group) == 0) {
 			entry = g_memdup(cur, sizeof(info_field));
 			entry->value = g_strdup(info[entry->pos]);
-			group = g_list_insert_sorted_with_data(group, entry, info_field_compare, NULL);
+			group = g_list_insert_sorted(group, entry, info_field_compare);
 		}
 		cur++;
 	}


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

[Gaim-commits] SF.net SVN: gaim: [16583] trunk/src/protocols/gg/gg.c

[<ev...@us...>]

Revision: 16583
Author:   evands
Date:     2006-07-27 10:37:42 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16583&view=rev

Log Message:
-----------
Fix a crash when gadu-gadu signs off while a search is still open.  It destroys its search HashTable in its close() function, and that table is accessed when gaim_notify_close_with_handle() is called.  An alternative fix would be for the close_with_handle() functions to be called before prpl_info->close() in connection.c, but I'm not positive that this wouldn't cause problems with other prpls, so I went for a smaller-impact change.  I'll merge this back to the 2.0.0 branch if there are no objections.

Modified Paths:
--------------
    trunk/src/protocols/gg/gg.c
Modified: trunk/src/protocols/gg/gg.c
===================================================================
--- trunk/src/protocols/gg/gg.c	2006-07-27 02:20:33 UTC (rev 16582)
+++ trunk/src/protocols/gg/gg.c	2006-07-27 17:37:42 UTC (rev 16583)
@@ -1737,6 +1737,11 @@
 			gg_free_session(info->session);
 		}
 
+		/* Immediately close any notifications on this handle since that process depends
+		 * upon the contents of info->searches, which we are about to destroy.
+		 */
+		gaim_notify_close_with_handle(gc);
+
 		ggp_search_destroy(info->searches);
 		g_free(info);
 		gc->proto_data = NULL;


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

[Gaim-commits] SF.net SVN: gaim: [16580] branches/soc-2006-file-loggers/src/log.h

[<ro...@us...>]

Revision: 16580
Author:   roast
Date:     2006-07-25 21:03:34 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16580&view=rev

Log Message:
-----------
added v0.4-02 list of loggable events

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.h
Modified: branches/soc-2006-file-loggers/src/log.h
===================================================================
--- branches/soc-2006-file-loggers/src/log.h	2006-07-26 03:52:47 UTC (rev 16579)
+++ branches/soc-2006-file-loggers/src/log.h	2006-07-26 04:03:34 UTC (rev 16580)
@@ -47,6 +47,53 @@
 	GAIM_LOG_READ_NO_NEWLINE = 1
 } GaimLogReadFlags;
 
+/**
+ * A list of recognizable events that are logged.
+ */
+typedef enum
+{
+	GAIM_EVENT_UNSET = 0,
+	GAIM_EVENT_LOGSTARTED,
+	GAIM_EVENT_LOGENDED,
+	GAIM_EVENT_WINDOWOPENED,
+	GAIM_EVENT_WINDOWCLOSED,
+	GAIM_EVENT_FILETRANSFERREQUESTED,
+	GAIM_EVENT_FILETRANSFERREJECTED,
+	GAIM_EVENT_FILETRANSFERACCEPTED,
+	GAIM_EVENT_FILETRANSFERSTARTED,
+	GAIM_EVENT_FILETRANSFERABORTED,
+	GAIM_EVENT_FILETRANSFERCOMPLETED,
+	GAIM_EVENT_AUTHORIZATIONREQUESTED,
+	GAIM_EVENT_AUTHORIZATIONDENIED,
+	GAIM_EVENT_AUTHORIZATIONCANCELLED,
+	GAIM_EVENT_AUTHORZATIONGRANTED,
+	GAIM_EVENT_CHANNELMODES,
+	GAIM_EVENT_CHANNELMODECHANGED,
+	GAIM_EVENT_CHANNELTOPIC,
+	GAIM_EVENT_CHANNELTOPICCHANGED,
+	GAIM_EVENT_SUBJECT,
+	GAIM_EVENT_SUBJECTCHANGED,
+	GAIM_EVENT_USERFORMATTEDID,
+	GAIM_EVENT_USERFORMATTEDIDCHANGED,
+	GAIM_EVENT_USERALIAS,
+	GAIM_EVENT_USERALIASCHANGED,
+	GAIM_EVENT_USERHANDLE,
+	GAIM_EVENT_USERHANDLECHANGED,
+	GAIM_EVENT_USERPERMISSIONS,
+	GAIM_EVENT_USERPERMISSIONS_PROMOTED,
+	GAIM_EVENT_USERPERMISSIONS_DEMOTED,
+	GAIM_EVENT_USERPERMISSIONS_VOICED,
+	GAIM_EVENT_USERPERMISSIONS_DEVOICED,
+	GAIM_EVENT_USERJOINED,
+	GAIM_EVENT_USERPARTED,
+	GAIM_EVENT_USERQUIT,
+	GAIM_EVENT_USERKICKED,
+	GAIM_EVENT_USERBANNED,
+	GAIM_EVENT_USERKLINED,
+	GAIM_EVENT_USERGLINED,
+	GAIM_TOTAL_EVENTS
+} GaimEvents;
+
 //typedef enum {
 //	GAIM_STATUS_ONLINE,	/***< online */
 //	GAIM_STATUS_OFFLINE,	/***< offline */


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

[Gaim-commits] SF.net SVN: gaim: [16582] trunk/src/conversation.c

[<aar...@us...>]

Revision: 16582
Author:   aaronsheldon
Date:     2006-07-26 19:20:33 -0700 (Wed, 26 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16582&view=rev

Log Message:
-----------
Memory leak plug

Modified Paths:
--------------
    trunk/src/conversation.c
Modified: trunk/src/conversation.c
===================================================================
--- trunk/src/conversation.c	2006-07-26 06:42:59 UTC (rev 16581)
+++ trunk/src/conversation.c	2006-07-27 02:20:33 UTC (rev 16582)
@@ -1952,8 +1952,12 @@
 {
 	g_return_if_fail(cb != NULL);
 
+	g_free(cb->alias);
+	g_free(cb->alias_key);
 	g_free(cb->name);
 	cb->name = NULL;
+	cb->alias = NULL;
+	cb->alias_key = NULL;
 	cb->flags = 0;
 
 	GAIM_DBUS_UNREGISTER_POINTER(cb);


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

[Gaim-commits] SF.net SVN: gaim: [16578] trunk/src/win32/win32dep.c

[<amc...@us...>]

Revision: 16578
Author:   amc_grim
Date:     2006-07-25 20:51:39 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16578&view=rev

Log Message:
-----------
Patch from Kevin Stange ...

Kevin Stange: removes a useless gtk related extern.

Modified Paths:
--------------
    trunk/src/win32/win32dep.c
Modified: trunk/src/win32/win32dep.c
===================================================================
--- trunk/src/win32/win32dep.c	2006-07-26 03:32:31 UTC (rev 16577)
+++ trunk/src/win32/win32dep.c	2006-07-26 03:51:39 UTC (rev 16578)
@@ -74,7 +74,6 @@
  */
 
 FARPROC wgaim_find_and_loadproc(char*, char*);
-extern void wgaim_gtkspell_init();
 char* wgaim_data_dir(void);
 
 /*


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

[Gaim-commits] SF.net SVN: gaim: [16576] branches/soc-2006-file-loggers/src/log.c

[<ro...@us...>]

Revision: 16576
Author:   roast
Date:     2006-07-25 20:18:31 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16576&view=rev

Log Message:
-----------
ULF 0.4-02, message.self->message.echo

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.c
Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-07-26 03:01:27 UTC (rev 16575)
+++ branches/soc-2006-file-loggers/src/log.c	2006-07-26 03:18:31 UTC (rev 16576)
@@ -1109,7 +1109,7 @@
 		}
 			
 		g_string_printf(writebuf, "\t<message time=\"%s\"%s%s%s auto=\"true\">%s</message>\n",
-				date, from_attributes, recv_from_self ? " self=\"true\"" : "",
+				date, from_attributes, recv_from_self ? " echo=\"true\"" : "",
 				gaim_message_is_action(msg_fixed, -1) ? " type=\"action\"": "", msg_fixed);
 	}
 	else if (type & GAIM_MESSAGE_SEND || type & GAIM_MESSAGE_RECV) {
@@ -1123,7 +1123,7 @@
 		}
 			
 		g_string_printf(writebuf, "\t<message time=\"%s\"%s%s%s>%s</message>\n",
-				date, from_attributes, recv_from_self ? " self=\"true\"" : "", 
+				date, from_attributes, recv_from_self ? " echo=\"true\"" : "", 
 				gaim_message_is_action(msg_fixed, -1) ? " type=\"action\"": "", msg_fixed);
 	}
 	else {


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

[Gaim-commits] SF.net SVN: gaim: [16577] branches/soc-2006-file-loggers/src/log.c

[<ro...@us...>]

Revision: 16577
Author:   roast
Date:     2006-07-25 20:32:31 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16577&view=rev

Log Message:
-----------
boolean for to choose to log original or corrected html

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.c
Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-07-26 03:18:31 UTC (rev 16576)
+++ branches/soc-2006-file-loggers/src/log.c	2006-07-26 03:32:31 UTC (rev 16577)
@@ -565,6 +565,7 @@
 	gaim_prefs_add_bool("/core/logging/log_ims", FALSE);
 	gaim_prefs_add_bool("/core/logging/log_chats", FALSE);
 	gaim_prefs_add_bool("/core/logging/log_system", FALSE);
+	gaim_prefs_add_bool("/core/logging/log_corrected_html", TRUE);
 
 	gaim_prefs_add_string("/core/logging/format", "txt");
 
@@ -1017,6 +1018,7 @@
 	GString *writebuf;
 	GIOStatus iostat;
 	GError *gerror = NULL;
+	gboolean log_corrected_html = gaim_prefs_get_bool("/core/logging/log_corrected_html");
 
 	char *from_normed = g_strdup(gaim_normalize(log->account, from));
 	char *from_attributes;
@@ -1081,7 +1083,11 @@
 	if(!data->channel)
 		return 0;
 
-	gaim_markup_html_to_xhtml(message, &msg_fixed, NULL);
+	if (log_corrected_html) {
+		gaim_markup_html_to_xhtml(message, &msg_fixed, NULL);
+	} else {
+		msg_fixed = (char *)message;
+	}
 
 	if (log->type == GAIM_LOG_SYSTEM) {
 		g_string_printf(writebuf, "\t<event time=\"%s\"%s gaim:type=\"system\">%s</event>\n", date, from_attributes, msg_fixed);
@@ -1140,7 +1146,10 @@
 	else written += written_buf;
 
 	g_free(date);
-	g_free(msg_fixed);
+	if (log_corrected_html) {
+		// free only if we need to free this
+		g_free(msg_fixed);
+	}
 
 	// append suffix to file and seek back to keep a valid XML document out of the user space buffer
 	g_string_printf(writebuf,
@@ -1276,6 +1285,7 @@
 	GString *writebuf = g_string_new("");
 	GIOStatus iostat;
 	GError *gerror = NULL;
+	gboolean log_corrected_html = gaim_prefs_get_bool("/core/logging/log_corrected_html");
 
 	if(!data) {
 		const char *prpl =
@@ -1321,7 +1331,12 @@
 	if(!data->channel)
 		return 0;
 
-	gaim_markup_html_to_xhtml(message, &msg_fixed, NULL);
+	if (log_corrected_html) {
+		gaim_markup_html_to_xhtml(message, &msg_fixed, NULL);
+	} else {
+		msg_fixed = (char *)message;
+	}
+
 	date = log_get_timestamp(log, time);
 
 	if(log->type == GAIM_LOG_SYSTEM)
@@ -1358,7 +1373,10 @@
 				date, from, msg_fixed);
 	}
 	g_free(date);
-	g_free(msg_fixed);
+	if (log_corrected_html) {
+		// free only if we need to free this
+		g_free(msg_fixed);
+	}
 
 	iostat = g_io_channel_write_chars(data->channel, writebuf->str, -1, &written_buf, &gerror);
 	if (iostat == G_IO_STATUS_ERROR) {


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

[Gaim-commits] SF.net SVN: gaim: [16575] branches/soc-2006-file-loggers/src/log.c

[<ro...@us...>]

Revision: 16575
Author:   roast
Date:     2006-07-25 20:01:27 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16575&view=rev

Log Message:
-----------
accountformatted and senderformatted done.

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.c
Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-07-25 17:46:58 UTC (rev 16574)
+++ branches/soc-2006-file-loggers/src/log.c	2006-07-26 03:01:27 UTC (rev 16575)
@@ -1019,8 +1019,14 @@
 	GError *gerror = NULL;
 
 	char *from_normed = g_strdup(gaim_normalize(log->account, from));
-	gboolean from_is_normed = (g_ascii_strcasecmp(from, from_normed) == 0);
-	char *from_suffix = g_strconcat(from_normed, "\" senderformatted=\"", NULL);
+	char *from_attributes;
+	if (strncmp(from, from_normed, strlen(from)) == 0) {
+		// if from is already normalized; leave senderformatted out
+		from_attributes = g_strconcat(" sender=\"", from_normed, "\"", NULL);
+	} else {
+		// from is NOT normalized; specifying senderformatted
+		from_attributes = g_strconcat(" sender=\"", from_normed, "\" senderformatted=\"", from, "\"", NULL);
+	}
 	
 	writebuf = g_string_new("");
 
@@ -1031,10 +1037,17 @@
 	if (!log->logger_data) {
 		const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO(plugin)->list_icon(log->account, NULL);
 
-		/* this is not thread-safe at all */
 		char *account_normed = g_strdup(gaim_normalize(log->account, gaim_account_get_username(log->account)));
-		gboolean account_is_normed = (g_ascii_strcasecmp(gaim_account_get_username(log->account), account_normed));
-		char *account_suffix = g_strconcat(account_suffix, "\" accountformatted=\"", NULL);
+		char *account_attributes;
+		if (strncmp(gaim_account_get_username(log->account), account_normed, strlen(account_normed)) == 0) {
+			// if account is already normalized
+			account_attributes = g_strconcat(" account=\"", account_normed, "\"", NULL);
+		} else {
+			// account is NOT normalized; specifying accountformatted
+			account_attributes = g_strconcat(" account=\"", account_normed,
+							 "\" accountformatted=\"",
+							 gaim_account_get_username(log->account), "\"", NULL);
+		}
 
 		gaim_log_common_writer(log, ".chatlog");
 
@@ -1046,12 +1059,11 @@
 		g_string_printf(writebuf,
 				"%c%c%c"
 				"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
-				"<chat xmlns=\"http://purl.org/net/ulf/ns/0.4-02\" service=\"%s\" account=\"%s%s\"%s>\n"
+				"<chat xmlns=\"http://purl.org/net/ulf/ns/0.4-02\" service=\"%s\"%s%s>\n"
 				"\t<event time=\"%s\" type=\"logStart\" />\n",
 				0xEF, 0xBB, 0xBF, prpl,
-				account_is_normed ? "" : account_suffix,
-				gaim_account_get_username(log->account),
-				log->type == GAIM_LOG_SYSTEM ? "gaim:logtype=\"system\"" : "", date);
+				account_attributes,
+				log->type == GAIM_LOG_SYSTEM ? " gaim:logtype=\"system\"" : "", date);
 		
 		iostat = g_io_channel_write_chars(data->channel, writebuf->str, -1, &written_buf, &gerror);
 		if (iostat == G_IO_STATUS_ERROR) {
@@ -1062,7 +1074,7 @@
 		else written += written_buf;
 
 		g_free(account_normed);
-		g_free(account_suffix);
+		g_free(account_attributes);
 	}
 
 	/* if we can't write to the file, give up before we hurt ourselves */
@@ -1072,19 +1084,19 @@
 	gaim_markup_html_to_xhtml(message, &msg_fixed, NULL);
 
 	if (log->type == GAIM_LOG_SYSTEM) {
-		g_string_printf(writebuf, "\t<event time=\"%s\" sender=\"%s\" gaim:type=\"system\">%s</event>\n", date, from, msg_fixed);
+		g_string_printf(writebuf, "\t<event time=\"%s\"%s gaim:type=\"system\">%s</event>\n", date, from_attributes, msg_fixed);
 	}
 	else if (type & GAIM_MESSAGE_SYSTEM) {
-		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\" gaim:type=\"system\">%s</message>\n", date, from, msg_fixed);
+		g_string_printf(writebuf, "\t<message time=\"%s\"%s gaim:type=\"system\">%s</message>\n", date, from_attributes, msg_fixed);
 	}
 	else if (type & GAIM_MESSAGE_ERROR) {
-		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\" gaim:type=\"error\">%s</message>\n", date, from, msg_fixed);
+		g_string_printf(writebuf, "\t<message time=\"%s\"%s gaim:type=\"error\">%s</message>\n", date, from_attributes, msg_fixed);
 	}
 	else if (type & GAIM_MESSAGE_WHISPER) {
-		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\" type=\"whisper\">%s</message>\n", date, from, msg_fixed);
+		g_string_printf(writebuf, "\t<message time=\"%s\"%s type=\"whisper\">%s</message>\n", date, from_attributes, msg_fixed);
 	}
 	else if (type & GAIM_MESSAGE_BELL) {
-		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\" type=\"bell\">%s</message>\n", date, from, msg_fixed);
+		g_string_printf(writebuf, "\t<message time=\"%s\"%s type=\"bell\">%s</message>\n", date, from_attributes, msg_fixed);
 	}
 	else if (type & GAIM_MESSAGE_AUTO_RESP && (type & GAIM_MESSAGE_SEND || type & GAIM_MESSAGE_RECV)) {
 		gboolean recv_from_self = FALSE;
@@ -1096,8 +1108,8 @@
 			}
 		}
 			
-		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\"%s%s auto=\"true\">%s</message>\n",
-				date, from, recv_from_self ? " self=\"true\"" : "",
+		g_string_printf(writebuf, "\t<message time=\"%s\"%s%s%s auto=\"true\">%s</message>\n",
+				date, from_attributes, recv_from_self ? " self=\"true\"" : "",
 				gaim_message_is_action(msg_fixed, -1) ? " type=\"action\"": "", msg_fixed);
 	}
 	else if (type & GAIM_MESSAGE_SEND || type & GAIM_MESSAGE_RECV) {
@@ -1110,13 +1122,13 @@
 			}
 		}
 			
-		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\"%s%s>%s</message>\n",
-				date, from, recv_from_self ? " self=\"true\"" : "", 
+		g_string_printf(writebuf, "\t<message time=\"%s\"%s%s%s>%s</message>\n",
+				date, from_attributes, recv_from_self ? " self=\"true\"" : "", 
 				gaim_message_is_action(msg_fixed, -1) ? " type=\"action\"": "", msg_fixed);
 	}
 	else {
 		gaim_debug_error("log", "Unhandled message type.");
-		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\">%s</message>\n", date, from, msg_fixed);
+		g_string_printf(writebuf, "\t<message time=\"%s\"%s>%s</message>\n", date, from_attributes, msg_fixed);
 	}
 
 	iostat = g_io_channel_write_chars(data->channel, writebuf->str, -1, &written_buf, &gerror);
@@ -1158,7 +1170,7 @@
 	}
 
 	g_free(from_normed);
-	g_free(from_suffix);
+	g_free(from_attributes);
 	g_string_free(writebuf, TRUE);
 	return written;
 }


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

[Gaim-commits] SF.net SVN: gaim: [16574] branches/v2_0_0/src

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

Revision: 16574
Author:   seanegan
Date:     2006-07-25 10:46:58 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16574&view=rev

Log Message:
-----------
Backport to 2.0.0

Modified Paths:
--------------
    branches/v2_0_0/src/gtkconv.c
    branches/v2_0_0/src/gtkconv.h
    branches/v2_0_0/src/log.c
Modified: branches/v2_0_0/src/gtkconv.c
===================================================================
--- branches/v2_0_0/src/gtkconv.c	2006-07-25 17:34:29 UTC (rev 16573)
+++ branches/v2_0_0/src/gtkconv.c	2006-07-25 17:46:58 UTC (rev 16574)
@@ -3811,10 +3811,9 @@
 	GtkWidget *vbox, *hbox, *frame;
 	GtkWidget *imhtml_sw;
 	GtkPolicyType imhtml_sw_hscroll;
-	GtkWidget *lbox, *bbox;
+	GtkWidget *lbox;
 	GtkWidget *label;
 	GtkWidget *list;
-	GtkWidget *button;
 	GtkWidget *sw;
 	GtkListStore *ls;
 	GtkCellRenderer *rend;
@@ -3963,48 +3962,6 @@
 
 	gtk_container_add(GTK_CONTAINER(sw), list);
 
-	/* Setup the user list toolbar. */
-	bbox = gtk_hbox_new(TRUE, GAIM_HIG_BOX_SPACE);
-	gtk_box_pack_start(GTK_BOX(lbox), bbox, FALSE, FALSE, 0);
-	gtk_widget_show(bbox);
-
-	/* IM */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_IM,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_im = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button, _("IM the user"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(chat_im_button_cb), gtkconv);
-
-	gtk_widget_show(button);
-
-	/* Ignore */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_IGNORE,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_ignore = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button,
-						 _("Ignore the user"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(ignore_cb), gtkconv);
-	gtk_widget_show(button);
-
-	/* Info */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_INFO,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_info = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button,
-						 _("Get the user's information"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-	                 G_CALLBACK(info_cb), gtkconv);
-
-	gtk_widget_show(button);
-
 	/* Setup the bottom half of the conversation window */
 	vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, TRUE);
@@ -5518,13 +5475,7 @@
 									 (gaim_blist_find_chat(account, gaim_conversation_get_name(conv)) != NULL));
 		}
 
-		/* Deal with chat userlist buttons */
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
-		{
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_im, TRUE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_ignore, TRUE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_info, (prpl_info->get_info != NULL));
-		}
+  
 	} else {
 		/* Account is offline */
 		/* Or it's a chat that we've left. */
@@ -5540,14 +5491,6 @@
 		gtk_widget_set_sensitive(win->menu.remove, FALSE);
 		gtk_widget_set_sensitive(win->menu.insert_link, TRUE);
 		gtk_widget_set_sensitive(win->menu.insert_image, FALSE);
-
-		/* Deal with chat userlist buttons */
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
-		{
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_im, FALSE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_ignore, FALSE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_info, FALSE);
-		}
 	}
 
 	/*
@@ -6507,7 +6450,13 @@
 	                                    "GaimGtkWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
-	                     gaim_marshal_POINTER__POINTER_POINTER,
+#if SIZEOF_TIME_T == 4
+	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+#error Unkown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_CONVERSATION),

Modified: branches/v2_0_0/src/gtkconv.h
===================================================================
--- branches/v2_0_0/src/gtkconv.h	2006-07-25 17:34:29 UTC (rev 16573)
+++ branches/v2_0_0/src/gtkconv.h	2006-07-25 17:46:58 UTC (rev 16574)
@@ -102,9 +102,6 @@
 	GtkWidget *count;
 	GtkWidget *list;
 	GtkWidget *topic_text;
-	GtkWidget *userlist_im;
-	GtkWidget *userlist_ignore;
-	GtkWidget *userlist_info;
 };
 
 /**

Modified: branches/v2_0_0/src/log.c
===================================================================
--- branches/v2_0_0/src/log.c	2006-07-25 17:34:29 UTC (rev 16573)
+++ branches/v2_0_0/src/log.c	2006-07-25 17:46:58 UTC (rev 16574)
@@ -593,7 +593,13 @@
 	gaim_log_logger_add(old_logger);
 
 	gaim_signal_register(handle, "log-timestamp",
-	                     gaim_marshal_POINTER__POINTER_POINTER,
+#if SIZEOF_TIME_T == 4
+	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+#error Unknown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),


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

[Gaim-commits] SF.net SVN: gaim: [16573] trunk/src

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

Revision: 16573
Author:   seanegan
Date:     2006-07-25 10:34:29 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16573&view=rev

Log Message:
-----------
Didn't mean to revert that.

Modified Paths:
--------------
    trunk/src/gtkconv.c
    trunk/src/log.c
Modified: trunk/src/gtkconv.c
===================================================================
--- trunk/src/gtkconv.c	2006-07-25 17:30:03 UTC (rev 16572)
+++ trunk/src/gtkconv.c	2006-07-25 17:34:29 UTC (rev 16573)
@@ -6518,7 +6518,13 @@
 	                                    "GaimGtkWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
+#if SIZEOF_TIME_T == 4
 	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+#error Unkown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),

Modified: trunk/src/log.c
===================================================================
--- trunk/src/log.c	2006-07-25 17:30:03 UTC (rev 16572)
+++ trunk/src/log.c	2006-07-25 17:34:29 UTC (rev 16573)
@@ -594,7 +594,13 @@
 	gaim_log_logger_add(old_logger);
 
 	gaim_signal_register(handle, "log-timestamp",
+#if SIZEOF_TIME_T == 4
 	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+#error Unknown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),


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

[Gaim-commits] SF.net SVN: gaim: [16572] trunk/src

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

Revision: 16572
Author:   seanegan
Date:     2006-07-25 10:30:03 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16572&view=rev

Log Message:
-----------
Now that we've killed convo and blist toolbars, the chatlist toolbar seems out-of-place to me

Modified Paths:
--------------
    trunk/src/gtkconv.c
    trunk/src/gtkconv.h
    trunk/src/log.c
Modified: trunk/src/gtkconv.c
===================================================================
--- trunk/src/gtkconv.c	2006-07-25 17:00:51 UTC (rev 16571)
+++ trunk/src/gtkconv.c	2006-07-25 17:30:03 UTC (rev 16572)
@@ -3869,10 +3869,9 @@
 	GtkWidget *vbox, *hbox, *frame;
 	GtkWidget *imhtml_sw;
 	GtkPolicyType imhtml_sw_hscroll;
-	GtkWidget *lbox, *bbox;
+	GtkWidget *lbox;
 	GtkWidget *label;
 	GtkWidget *list;
-	GtkWidget *button;
 	GtkWidget *sw;
 	GtkListStore *ls;
 	GtkCellRenderer *rend;
@@ -4020,48 +4019,6 @@
 
 	gtk_container_add(GTK_CONTAINER(sw), list);
 
-	/* Setup the user list toolbar. */
-	bbox = gtk_hbox_new(TRUE, GAIM_HIG_BOX_SPACE);
-	gtk_box_pack_start(GTK_BOX(lbox), bbox, FALSE, FALSE, 0);
-	gtk_widget_show(bbox);
-
-	/* IM */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_IM,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_im = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button, _("IM the user"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(chat_im_button_cb), gtkconv);
-
-	gtk_widget_show(button);
-
-	/* Ignore */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_IGNORE,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_ignore = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button,
-						 _("Ignore the user"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(ignore_cb), gtkconv);
-	gtk_widget_show(button);
-
-	/* Info */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_INFO,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_info = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button,
-						 _("Get the user's information"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-	                 G_CALLBACK(info_cb), gtkconv);
-
-	gtk_widget_show(button);
-
 	/* Setup the bottom half of the conversation window */
 	vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, TRUE);
@@ -5586,13 +5543,7 @@
 									 (gaim_blist_find_chat(account, gaim_conversation_get_name(conv)) != NULL));
 		}
 
-		/* Deal with chat userlist buttons */
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
-		{
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_im, TRUE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_ignore, TRUE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_info, (prpl_info->get_info != NULL));
-		}
+  
 	} else {
 		/* Account is offline */
 		/* Or it's a chat that we've left. */
@@ -5608,14 +5559,6 @@
 		gtk_widget_set_sensitive(win->menu.remove, FALSE);
 		gtk_widget_set_sensitive(win->menu.insert_link, TRUE);
 		gtk_widget_set_sensitive(win->menu.insert_image, FALSE);
-
-		/* Deal with chat userlist buttons */
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
-		{
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_im, FALSE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_ignore, FALSE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_info, FALSE);
-		}
 	}
 
 	/*
@@ -6575,13 +6518,7 @@
 	                                    "GaimGtkWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
-#if SIZEOF_TIME_T == 4
 	                     gaim_marshal_POINTER__POINTER_INT,
-#elif SIZEOF_TIME_T == 8
-			     gaim_marshal_POINTER__POINTER_INT64,
-#else
-# error Unknown size of time_t
-#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),

Modified: trunk/src/gtkconv.h
===================================================================
--- trunk/src/gtkconv.h	2006-07-25 17:00:51 UTC (rev 16571)
+++ trunk/src/gtkconv.h	2006-07-25 17:30:03 UTC (rev 16572)
@@ -103,9 +103,6 @@
 	GtkWidget *count;
 	GtkWidget *list;
 	GtkWidget *topic_text;
-	GtkWidget *userlist_im;
-	GtkWidget *userlist_ignore;
-	GtkWidget *userlist_info;
 };
 
 /**

Modified: trunk/src/log.c
===================================================================
--- trunk/src/log.c	2006-07-25 17:00:51 UTC (rev 16571)
+++ trunk/src/log.c	2006-07-25 17:30:03 UTC (rev 16572)
@@ -594,13 +594,7 @@
 	gaim_log_logger_add(old_logger);
 
 	gaim_signal_register(handle, "log-timestamp",
-#if SIZEOF_TIME_T == 4
 	                     gaim_marshal_POINTER__POINTER_INT,
-#elif SIZEOF_TIME_T == 8
-			     gaim_marshal_POINTER__POINTER_INT64,
-#else
-# error Unknown size of time_t
-#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),


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

[Gaim-commits] SF.net SVN: gaim: [16571] branches/v2_0_0/src/gtkconn.c

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

Revision: 16571
Author:   seanegan
Date:     2006-07-25 10:00:51 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16571&view=rev

Log Message:
-----------
Backport

Modified Paths:
--------------
    branches/v2_0_0/src/gtkconn.c
Modified: branches/v2_0_0/src/gtkconn.c
===================================================================
--- branches/v2_0_0/src/gtkconn.c	2006-07-25 04:31:36 UTC (rev 16570)
+++ branches/v2_0_0/src/gtkconn.c	2006-07-25 17:00:51 UTC (rev 16571)
@@ -37,7 +37,9 @@
 #include "gtkutils.h"
 #include "util.h"
 
-#define INITIAL_RECON_DELAY 8000
+#define INITIAL_RECON_DELAY_MIN  8000
+#define INITIAL_RECON_DELAY_MAX 60000
+
 #define MAX_RECON_DELAY 600000
 
 typedef struct {
@@ -155,7 +157,7 @@
 		if (info == NULL) {
 			info = g_new0(GaimAutoRecon, 1);
 			g_hash_table_insert(hash, account, info);
-			info->delay = INITIAL_RECON_DELAY;
+			info->delay = g_random_int_range(INITIAL_RECON_DELAY_MIN, INITIAL_RECON_DELAY_MAX);
 		} else {
 			info->delay = MIN(2 * info->delay, MAX_RECON_DELAY);
 			if (info->timeout != 0)


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