pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17206] trunk/libgaim/protocols/sametime/sametime.c

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

Revision: 17206
          http://svn.sourceforge.net/gaim/?rev=17206&view=rev
Author:   thekingant
Date:     2006-09-09 13:54:23 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
gaim.h should only be used by stuff outside of libgaim?

Modified Paths:
--------------
    trunk/libgaim/protocols/sametime/sametime.c

Modified: trunk/libgaim/protocols/sametime/sametime.c
===================================================================
--- trunk/libgaim/protocols/sametime/sametime.c	2006-09-09 20:47:12 UTC (rev 17205)
+++ trunk/libgaim/protocols/sametime/sametime.c	2006-09-09 20:54:23 UTC (rev 17206)
@@ -33,7 +33,6 @@
 
 /* gaim includes */
 #include "internal.h"
-#include "gaim.h"
 #include "config.h"
 
 #include "account.h"


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

[Gaim-commits] SF.net SVN: gaim: [17686] trunk/libgaim/protocols/sametime/sametime.c

[<tal...@us...>]

Revision: 17686
          http://svn.sourceforge.net/gaim/?rev=17686&view=rev
Author:   taliesein
Date:     2006-11-06 14:32:49 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
fixing bug 1437328, and keeping the sametime plugin from wresting control of the buddy list away from the user

Modified Paths:
--------------
    trunk/libgaim/protocols/sametime/sametime.c

Modified: trunk/libgaim/protocols/sametime/sametime.c
===================================================================
--- trunk/libgaim/protocols/sametime/sametime.c	2006-11-06 22:22:52 UTC (rev 17685)
+++ trunk/libgaim/protocols/sametime/sametime.c	2006-11-06 22:32:49 UTC (rev 17686)
@@ -4410,10 +4410,17 @@
     return;
   }
 
+#if 0
   /* fall-through indicates that we couldn't find a matching user in
      the resolve service (ether error or zero results), so we remove
      this buddy */
 
+  /* note: I can't really think of a good reason to alter the buddy
+     list in any way. There has been at least one report where the
+     resolve service isn't returning correct results anyway, so let's
+     just leave them in the list. I'm just going to if0 this section
+     out unless I can think of a very good reason to do this. -siege */
+
   DEBUG_INFO("no such buddy in community\n");
   gaim_blist_remove_buddy(buddy);
   blist_schedule(pd);
@@ -4435,6 +4442,7 @@
 
     g_free(msg);
   }
+#endif
 }
 
 


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

[Gaim-commits] SF.net SVN: gaim: [18157] trunk/libgaim/protocols/sametime/sametime.c

[<tal...@us...>]

Revision: 18157
          http://svn.sourceforge.net/gaim/?rev=18157&view=rev
Author:   taliesein
Date:     2007-01-18 09:57:46 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
for bug 1638609, disconnect the signal when the account goes offline

Modified Paths:
--------------
    trunk/libgaim/protocols/sametime/sametime.c

Modified: trunk/libgaim/protocols/sametime/sametime.c
===================================================================
--- trunk/libgaim/protocols/sametime/sametime.c	2007-01-18 17:41:47 UTC (rev 18156)
+++ trunk/libgaim/protocols/sametime/sametime.c	2007-01-18 17:57:46 UTC (rev 18157)
@@ -1470,19 +1470,25 @@
   
   /* start watching for new conversations */
   gaim_signal_connect(gaim_conversations_get_handle(),
-		      "conversation-created", pd->gc,
+		      "conversation-created", pd,
 		      GAIM_CALLBACK(conversation_created_cb), pd);
 
   /* watch for group extended menu items */
   gaim_signal_connect(gaim_blist_get_handle(),
-		      "blist-node-extended-menu", pd->gc,
+		      "blist-node-extended-menu", pd,
 		      GAIM_CALLBACK(blist_node_menu_cb), pd);
-
+  
   /* use our services to do neat things */
   services_starting(pd);
 }
 
 
+static void session_stopping(struct mwGaimPluginData *pd) {
+  /* stop watching the signals from session_started */
+  gaim_signals_disconnect_by_handle(pd);
+}
+
+
 static void mw_session_stateChange(struct mwSession *session,
 				   enum mwSessionState state,
 				   gpointer info) {
@@ -1541,6 +1547,9 @@
     break;
 
   case mwSession_STOPPING:
+
+    session_stopping(pd);
+
     if(GPOINTER_TO_UINT(info) & ERR_FAILURE) {
       char *err = mwError(GPOINTER_TO_UINT(info));
       gaim_connection_error(gc, err);


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