pidgin: src/protocols/yahoo/yahoo.c comparison

comparison src/protocols/yahoo/yahoo.c @ 9370:76f4bffcfb23

[gaim-migrate @ 10178] I moved the #define to yahoo.h, and made some of the checks runtime, in hopes of still supporting yahoo japan. I also made some things not show up when using web messenger. For some reason I can't log in to yahoo japan now either. weird. committer: Tailor Script <tailor@pidgin.im>

author	Tim Ringenbach <marv@pidgin.im>
date	Thu, 24 Jun 2004 03:55:54 +0000
parents	241a799cc821
children	30598cb2efb5

comparison

equal deleted inserted replaced

-:241a799cc821
+:76f4bffcfb23
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */
-#define YAHOO_WEBMESSENGER
 #include "internal.h"
 #include "account.h"
 #include "accountopt.h"
 		yahoo_packet_free(pkt);
 	}
 }
-#ifndef YAHOO_WEBMESSENGER
 static void yahoo_got_connected(gpointer data, gint source, GaimInputCondition cond)
 {
 	GaimConnection *gc = data;
 	struct yahoo_data *yd;
 	struct yahoo_packet *pkt;
 	yahoo_packet_free(pkt);
 	gc->inpa = gaim_input_add(yd->fd, GAIM_INPUT_READ, yahoo_pending, gc);
 }
-#endif
-#ifdef YAHOO_WEBMESSENGER
 static void yahoo_got_web_connected(gpointer data, gint source, GaimInputCondition cond)
 {
 	GaimConnection *gc = data;
 	struct yahoo_data *yd;
 	struct yahoo_packet *pkt;
 		gaim_connection_error(gc, _("Connection problem"));
 		return;
 	}
 }
-#endif /* YAHOO_WEBMESSENGER */
-#ifndef YAHOO_WEBMESSENGER
 static void yahoo_server_check(GaimAccount *account)
 {
 	const char *server;
 	server = gaim_account_get_string(account, "server", YAHOO_PAGER_HOST);
 	buddyicon = gaim_account_get_buddy_icon(account);
 	yahoo_set_buddy_icon(gc, buddyicon);
 }
-#endif
 static void yahoo_login(GaimAccount *account) {
 	GaimConnection *gc = gaim_account_get_connection(account);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 	yd->fd = -1;
 	yd->friends = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, yahoo_friend_free);
 	yd->confs = NULL;
 	yd->conf_id = 2;
-#ifndef YAHOO_WEBMESSENGER
 	yahoo_server_check(account);
 	yahoo_picture_check(account);
 	if (gaim_account_get_bool(account, "yahoojp", FALSE)) {
 		{
 			gaim_connection_error(gc, _("Connection problem"));
 			return;
 		}
 	} else {
+#ifndef YAHOO_WEBMESSENGER
 		yd->jp = FALSE;
 		if (gaim_proxy_connect(account,
 		                       gaim_account_get_string(account, "server",  YAHOO_PAGER_HOST),
 		                       gaim_account_get_int(account, "port", YAHOO_PAGER_PORT),
 		                       yahoo_got_connected, gc) != 0)
 		{
 			gaim_connection_error(gc, _("Connection problem"));
 			return;
 		}
-	}
 #else
-	gaim_url_fetch(WEBMESSENGER_URL, TRUE, "Gaim/" VERSION, FALSE,
+		yd->wm = TRUE;
-	               yahoo_login_page_cb, gc);
+		gaim_url_fetch(WEBMESSENGER_URL, TRUE, "Gaim/" VERSION, FALSE,
+		               yahoo_login_page_cb, gc);
 #endif
+	}
 }
 static void yahoo_close(GaimConnection *gc) {
 	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
 {
 	GList *m = NULL;
 	GaimBlistNodeAction *act;
 	GaimConnection *gc = gaim_account_get_connection(buddy->account);
+	struct yahoo_data *yd = gc->proto_data;
 	static char buf2[1024];
 	YahooFriend *f;
 	f = yahoo_friend_find(gc, buddy->name);
-	if (!f) {
+	if (!f && !yd->wm) {
 		act = gaim_blist_node_action_new(_("Add Buddy"),
 				yahoo_addbuddyfrommenu_cb, NULL);
 		m = g_list_append(m, act);
 		return m;
 	} else if (f->status == YAHOO_STATUS_OFFLINE) {
 		return NULL;
 	}
-	act = gaim_blist_node_action_new(_("Join in Chat"),
+	if (!yd->wm) {
-			yahoo_chat_goto_menu, NULL);
+		act = gaim_blist_node_action_new(_("Join in Chat"),
-	m = g_list_append(m, act);
+				yahoo_chat_goto_menu, NULL);
+		m = g_list_append(m, act);
+	}
 	act = gaim_blist_node_action_new(_("Initiate Conference"),
 			yahoo_initiate_conference, NULL);
 	m = g_list_append(m, act);
 }
 static GList *yahoo_away_states(GaimConnection *gc)
 {
 	GList *m = NULL;
+	struct yahoo_data *yd = gc->proto_data;
 	m = g_list_append(m, _("Available"));
-	m = g_list_append(m, _("Be Right Back"));
+	if (!yd->wm) {
-	m = g_list_append(m, _("Busy"));
+		m = g_list_append(m, _("Be Right Back"));
-	m = g_list_append(m, _("Not At Home"));
+		m = g_list_append(m, _("Busy"));
-	m = g_list_append(m, _("Not At Desk"));
+		m = g_list_append(m, _("Not At Home"));
-	m = g_list_append(m, _("Not In Office"));
+		m = g_list_append(m, _("Not At Desk"));
-	m = g_list_append(m, _("On The Phone"));
+		m = g_list_append(m, _("Not In Office"));
-	m = g_list_append(m, _("On Vacation"));
+		m = g_list_append(m, _("On The Phone"));
-	m = g_list_append(m, _("Out To Lunch"));
+		m = g_list_append(m, _("On Vacation"));
-	m = g_list_append(m, _("Stepped Out"));
+		m = g_list_append(m, _("Out To Lunch"));
+		m = g_list_append(m, _("Stepped Out"));
+	}
 	m = g_list_append(m, _("Invisible"));
-	m = g_list_append(m, GAIM_AWAY_CUSTOM);
+	if (!yd->wm)
+		m = g_list_append(m, GAIM_AWAY_CUSTOM);
 	return m;
 }
 static void yahoo_keepalive(GaimConnection *gc)

Mercurial > pidgin

comparison src/protocols/yahoo/yahoo.c @ 9370:76f4bffcfb23