Mercurial > pidgin

diff libpurple/protocols/jabber/disco.c @ 15822:32c366eeeb99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sed -ie 's/gaim/purple/g'
author Sean Egan <seanegan@gmail.com>
date Mon, 19 Mar 2007 07:01:17 +0000
parents afa4230ccdd2
children 48aebb50a93d
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c	Mon Mar 19 06:11:46 2007 +0000
+++ b/libpurple/protocols/jabber/disco.c	Mon Mar 19 07:01:17 2007 +0000
@@ -1,5 +1,5 @@
 /*
- * gaim - Jabber Protocol Plugin
+ * purple - Jabber Protocol Plugin
  *
  * Copyright (C) 2003, Nathan Walp <faceprint@faceprint.com>
  *
@@ -217,8 +217,8 @@
 static void
 jabber_disco_finish_server_info_result_cb(JabberStream *js)
 {
-	GaimPresence *gpresence;
-	GaimStatus *status;
+	PurplePresence *gpresence;
+	PurpleStatus *status;
 
 	if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) {
 		/* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
@@ -226,8 +226,8 @@
 	}
 	
 	/* Send initial presence; this will trigger receipt of presence for contacts on the roster */
-	gpresence = gaim_account_get_presence(js->gc->account);
-	status = gaim_presence_get_active_status(gpresence);
+	gpresence = purple_account_get_presence(js->gc->account);
+	status = purple_presence_get_active_status(gpresence);
 	jabber_presence_send(js->gc->account, status);	
 }
 
@@ -274,7 +274,7 @@
 		g_free(js->server_name);
 		js->server_name = g_strdup(name);
 		if (!strcmp(name, "Google Talk")) {
-		  gaim_debug_info("jabber", "Google Talk!");
+		  purple_debug_info("jabber", "Google Talk!");
 		  js->googletalk = TRUE;
 		}
 	}