pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16078] trunk/src/account.c

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

Revision: 16078
Author:   thekingant
Date:     2006-04-20 21:14:29 -0700 (Thu, 20 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16078&view=rev

Log Message:
-----------
Give the "Set User Info" window a title.

Modified Paths:
--------------
    trunk/src/account.c
Modified: trunk/src/account.c
===================================================================
--- trunk/src/account.c	2006-04-21 04:03:53 UTC (rev 16077)
+++ trunk/src/account.c	2006-04-21 04:14:29 UTC (rev 16078)
@@ -1169,7 +1169,7 @@
 			   _("Change user information for %s"),
 			   gaim_account_get_username(account));
 
-	gaim_request_input(gc, NULL, primary, NULL,
+	gaim_request_input(gc, _("Set User Info"), primary, NULL,
 					   gaim_account_get_user_info(account),
 					   TRUE, FALSE, ((gc != NULL) &&
 					   (gc->flags & GAIM_CONNECTION_HTML) ? "html" : 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: [16144] trunk/src/account.c

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

Revision: 16144
Author:   thekingant
Date:     2006-05-07 12:45:02 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16144&view=rev

Log Message:
-----------
Disconnect an account before removing it from our list of accounts.
This gets rid of an assertion failure when deleting an online
account

Modified Paths:
--------------
    trunk/src/account.c
Modified: trunk/src/account.c
===================================================================
--- trunk/src/account.c	2006-05-07 18:28:32 UTC (rev 16143)
+++ trunk/src/account.c	2006-05-07 19:45:02 UTC (rev 16144)
@@ -865,11 +865,6 @@
 
 	gaim_debug_info("account", "Destroying account %p\n", account);
 
-	if (gaim_account_is_connected(account))
-		gaim_account_disconnect(account);
-
-	gaim_debug_info("account", "Continuing to destroy account %p\n", account);
-
 	for (l = gaim_get_conversations(); l != NULL; l = l->next)
 	{
 		GaimConversation *conv = (GaimConversation *)l->data;
@@ -2132,6 +2127,9 @@
 
 	g_return_if_fail(account != NULL);
 
+	if (gaim_account_is_connected(account))
+		gaim_account_disconnect(account);
+
 	gaim_notify_close_with_handle(account);
 	gaim_request_close_with_handle(account);
 


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

[Gaim-commits] SF.net SVN: gaim: [16140] trunk/src/account.c

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

Revision: 16140
Author:   thekingant
Date:     2006-05-07 10:40:42 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16140&view=rev

Log Message:
-----------
Get rid of an assertion warning when saving an account without an
alias that did not previous have an alias.

Yay for --enable-fatal-asserts

Modified Paths:
--------------
    trunk/src/account.c
Modified: trunk/src/account.c
===================================================================
--- trunk/src/account.c	2006-05-07 14:14:09 UTC (rev 16139)
+++ trunk/src/account.c	2006-05-07 17:40:42 UTC (rev 16140)
@@ -1205,6 +1205,13 @@
 {
 	g_return_if_fail(account != NULL);
 
+	/*
+	 * Do nothing if alias and account->alias are both NULL.  Or if
+	 * they're the exact same string.
+	 */
+	if (alias == account->alias)
+		return;
+
 	if ((!alias && account->alias) || (alias && !account->alias) ||
 			g_utf8_collate(account->alias, alias))
 	{


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

[Gaim-commits] SF.net SVN: gaim: [16700] trunk/src/account.c

[<dat...@us...>]

Revision: 16700
Author:   datallah
Date:     2006-08-10 19:42:13 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16700&view=rev

Log Message:
-----------
stuff allocated by g_malloc() should be freed with g_free()

Modified Paths:
--------------
    trunk/src/account.c
Modified: trunk/src/account.c
===================================================================
--- trunk/src/account.c	2006-08-11 02:40:31 UTC (rev 16699)
+++ trunk/src/account.c	2006-08-11 02:42:13 UTC (rev 16700)
@@ -696,14 +696,14 @@
 
 	if ((protocol_id == NULL) || (name == NULL))
 	{
-		free(protocol_id);
-		free(name);
+		g_free(protocol_id);
+		g_free(name);
 		return NULL;
 	}
 
 	ret = gaim_account_new(name, protocol_id);
-	free(name);
-	free(protocol_id);
+	g_free(name);
+	g_free(protocol_id);
 
 	/* Read the password */
 	child = xmlnode_get_child(node, "password");


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