Mercurial > pidgin.yaz
comparison libpurple/protocols/zephyr/zephyr.c @ 31575:ef2f89a2c25d
Use convenience variables.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 10 Jan 2011 01:16:57 +0000 |
parents | a8cc50c2279f |
children | 7c33eaed54e5 |
comparison
equal
deleted
inserted
replaced
31574:f033f3c49a41 | 31575:ef2f89a2c25d |
---|---|
868 | 868 |
869 } else { | 869 } else { |
870 zephyr_triple *zt1, *zt2; | 870 zephyr_triple *zt1, *zt2; |
871 gchar *send_inst_utf8; | 871 gchar *send_inst_utf8; |
872 zephyr_account *zephyr = gc->proto_data; | 872 zephyr_account *zephyr = gc->proto_data; |
873 zt1 = new_triple(gc->proto_data,notice.z_class, notice.z_class_inst, notice.z_recipient); | 873 zt1 = new_triple(zephyr,notice.z_class, notice.z_class_inst, notice.z_recipient); |
874 zt2 = find_sub_by_triple(gc->proto_data,zt1); | 874 zt2 = find_sub_by_triple(zephyr,zt1); |
875 if (!zt2) { | 875 if (!zt2) { |
876 /* This is a server supplied subscription */ | 876 /* This is a server supplied subscription */ |
877 zephyr->subscrips = g_slist_append(zephyr->subscrips, new_triple(zephyr,zt1->class,zt1->instance,zt1->recipient)); | 877 zephyr->subscrips = g_slist_append(zephyr->subscrips, new_triple(zephyr,zt1->class,zt1->instance,zt1->recipient)); |
878 zt2 = find_sub_by_triple(gc->proto_data,zt1); | 878 zt2 = find_sub_by_triple(zephyr,zt1); |
879 } | 879 } |
880 | 880 |
881 if (!zt2->open) { | 881 if (!zt2->open) { |
882 zt2->open = TRUE; | 882 zt2->open = TRUE; |
883 serv_got_joined_chat(gc, zt2->id, zt2->name); | 883 serv_got_joined_chat(gc, zt2->id, zt2->name); |
1497 } | 1497 } |
1498 } | 1498 } |
1499 | 1499 |
1500 static void process_anyone(PurpleConnection *gc) | 1500 static void process_anyone(PurpleConnection *gc) |
1501 { | 1501 { |
1502 zephyr_account *zephyr = purple_connection_get_protocol_data(gc); | |
1502 FILE *fd; | 1503 FILE *fd; |
1503 gchar buff[BUFSIZ], *filename; | 1504 gchar buff[BUFSIZ], *filename; |
1504 PurpleGroup *g; | 1505 PurpleGroup *g; |
1505 PurpleBuddy *b; | 1506 PurpleBuddy *b; |
1506 | 1507 |
1513 if ((fd = g_fopen(filename, "r")) != NULL) { | 1514 if ((fd = g_fopen(filename, "r")) != NULL) { |
1514 while (fgets(buff, BUFSIZ, fd)) { | 1515 while (fgets(buff, BUFSIZ, fd)) { |
1515 strip_comments(buff); | 1516 strip_comments(buff); |
1516 if (buff[0]) { | 1517 if (buff[0]) { |
1517 if (!(b = purple_find_buddy(gc->account, buff))) { | 1518 if (!(b = purple_find_buddy(gc->account, buff))) { |
1518 char *stripped_user = zephyr_strip_local_realm(gc->proto_data,buff); | 1519 char *stripped_user = zephyr_strip_local_realm(zephyr,buff); |
1519 purple_debug_info("zephyr","stripped_user %s\n",stripped_user); | 1520 purple_debug_info("zephyr","stripped_user %s\n",stripped_user); |
1520 if (!(b = purple_find_buddy(gc->account,stripped_user))){ | 1521 if (!(b = purple_find_buddy(gc->account,stripped_user))){ |
1521 b = purple_buddy_new(gc->account, stripped_user, NULL); | 1522 b = purple_buddy_new(gc->account, stripped_user, NULL); |
1522 purple_blist_add_buddy(b, NULL, g, NULL); | 1523 purple_blist_add_buddy(b, NULL, g, NULL); |
1523 } | 1524 } |
1922 } | 1923 } |
1923 g_free(fname); | 1924 g_free(fname); |
1924 fclose(fd); | 1925 fclose(fd); |
1925 } | 1926 } |
1926 | 1927 |
1927 static void write_anyone(PurpleConnection *gc) | 1928 static void write_anyone(zephyr_account *zephyr) |
1928 { | 1929 { |
1929 GSList *buddies; | 1930 GSList *buddies; |
1930 char *fname; | 1931 char *fname; |
1931 FILE *fd; | 1932 FILE *fd; |
1932 PurpleAccount *account; | 1933 PurpleAccount *account; |
1933 zephyr_account* zephyr = gc->proto_data; | |
1934 fname = g_strdup_printf("%s/.anyone", purple_home_dir()); | 1934 fname = g_strdup_printf("%s/.anyone", purple_home_dir()); |
1935 fd = g_fopen(fname, "w"); | 1935 fd = g_fopen(fname, "w"); |
1936 if (!fd) { | 1936 if (!fd) { |
1937 g_free(fname); | 1937 g_free(fname); |
1938 return; | 1938 return; |
1939 } | 1939 } |
1940 | 1940 |
1941 account = purple_connection_get_account(gc); | 1941 account = zephyr->account; |
1942 for (buddies = purple_find_buddies(account, NULL); buddies; | 1942 for (buddies = purple_find_buddies(account, NULL); buddies; |
1943 buddies = g_slist_delete_link(buddies, buddies)) { | 1943 buddies = g_slist_delete_link(buddies, buddies)) { |
1944 PurpleBuddy *b = buddies->data; | 1944 PurpleBuddy *b = buddies->data; |
1945 gchar *stripped_user = zephyr_strip_local_realm(zephyr, purple_buddy_get_name(b)); | 1945 gchar *stripped_user = zephyr_strip_local_realm(zephyr, purple_buddy_get_name(b)); |
1946 fprintf(fd, "%s\n", stripped_user); | 1946 fprintf(fd, "%s\n", stripped_user); |
1964 l = l->next; | 1964 l = l->next; |
1965 } | 1965 } |
1966 g_list_free(zephyr->pending_zloc_names); | 1966 g_list_free(zephyr->pending_zloc_names); |
1967 | 1967 |
1968 if (purple_account_get_bool(gc->account, "write_anyone", FALSE)) | 1968 if (purple_account_get_bool(gc->account, "write_anyone", FALSE)) |
1969 write_anyone(gc); | 1969 write_anyone(zephyr); |
1970 | 1970 |
1971 if (purple_account_get_bool(gc->account, "write_zsubs", FALSE)) | 1971 if (purple_account_get_bool(gc->account, "write_zsubs", FALSE)) |
1972 write_zsubs(gc->proto_data); | 1972 write_zsubs(zephyr); |
1973 | 1973 |
1974 s = zephyr->subscrips; | 1974 s = zephyr->subscrips; |
1975 while (s) { | 1975 while (s) { |
1976 free_triple((zephyr_triple *) s->data); | 1976 free_triple((zephyr_triple *) s->data); |
1977 s = s->next; | 1977 s = s->next; |
2030 PurpleConvChat *gcc; | 2030 PurpleConvChat *gcc; |
2031 char *inst; | 2031 char *inst; |
2032 char *recipient; | 2032 char *recipient; |
2033 zephyr_account *zephyr = gc->proto_data; | 2033 zephyr_account *zephyr = gc->proto_data; |
2034 | 2034 |
2035 zt = find_sub_by_id(gc->proto_data,id); | 2035 zt = find_sub_by_id(zephyr,id); |
2036 if (!zt) | 2036 if (!zt) |
2037 /* this should never happen. */ | 2037 /* this should never happen. */ |
2038 return -EINVAL; | 2038 return -EINVAL; |
2039 | 2039 |
2040 sig = zephyr_get_signature(); | 2040 sig = zephyr_get_signature(); |
2430 if (!recip || (*recip == '*')) | 2430 if (!recip || (*recip == '*')) |
2431 recip = ""; | 2431 recip = ""; |
2432 if (!g_ascii_strcasecmp(recip, "%me%")) | 2432 if (!g_ascii_strcasecmp(recip, "%me%")) |
2433 recip = zephyr->username; | 2433 recip = zephyr->username; |
2434 | 2434 |
2435 zt1 = new_triple(gc->proto_data,classname, instname, recip); | 2435 zt1 = new_triple(zephyr,classname, instname, recip); |
2436 zt2 = find_sub_by_triple(gc->proto_data,zt1); | 2436 zt2 = find_sub_by_triple(zephyr,zt1); |
2437 if (zt2) { | 2437 if (zt2) { |
2438 free_triple(zt1); | 2438 free_triple(zt1); |
2439 if (!zt2->open) { | 2439 if (!zt2->open) { |
2440 if (!g_ascii_strcasecmp(instname,"*")) | 2440 if (!g_ascii_strcasecmp(instname,"*")) |
2441 instname = "PERSONAL"; | 2441 instname = "PERSONAL"; |
2561 PurpleConvChat *gcc; | 2561 PurpleConvChat *gcc; |
2562 gchar *topic_utf8; | 2562 gchar *topic_utf8; |
2563 zephyr_account* zephyr = gc->proto_data; | 2563 zephyr_account* zephyr = gc->proto_data; |
2564 char *sender = (char *)zephyr->username; | 2564 char *sender = (char *)zephyr->username; |
2565 | 2565 |
2566 zt = find_sub_by_id(gc->proto_data,id); | 2566 zt = find_sub_by_id(zephyr,id); |
2567 /* find_sub_by_id can return NULL */ | 2567 /* find_sub_by_id can return NULL */ |
2568 if (!zt) | 2568 if (!zt) |
2569 return; | 2569 return; |
2570 gconv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, zt->name, | 2570 gconv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, zt->name, |
2571 gc->account); | 2571 gc->account); |