Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/jabber/buddy.c

libpurple/protocols/jabber/buddy.c

changeset 39483
ab4728087d87
parent 39481
4db28449567d
child 40052
cc03b5af25ea
equal deleted inserted replaced
39482:3e8b7fb5447b 39483:ab4728087d87
1858 return m; 1858 return m;
1859 1859
1860 if (js->protocol_version.major == 0 && js->protocol_version.minor == 9 && 1860 if (js->protocol_version.major == 0 && js->protocol_version.minor == 9 &&
1861 jb != js->user_jb) { 1861 jb != js->user_jb) {
1862 if(jb->invisible & JABBER_INVIS_BUDDY) { 1862 if(jb->invisible & JABBER_INVIS_BUDDY) {
1863 act = purple_menu_action_new(_("Un-hide From"), 1863 act = purple_action_menu_new(_("Un-hide From"),
1864 PURPLE_CALLBACK(jabber_buddy_make_visible), 1864 PURPLE_CALLBACK(jabber_buddy_make_visible),
1865 NULL, NULL); 1865 NULL, NULL);
1866 } else { 1866 } else {
1867 act = purple_menu_action_new(_("Temporarily Hide From"), 1867 act = purple_action_menu_new(_("Temporarily Hide From"),
1868 PURPLE_CALLBACK(jabber_buddy_make_invisible), 1868 PURPLE_CALLBACK(jabber_buddy_make_invisible),
1869 NULL, NULL); 1869 NULL, NULL);
1870 } 1870 }
1871 m = g_list_append(m, act); 1871 m = g_list_append(m, act);
1872 } 1872 }
1873 1873
1874 if(jb->subscription & JABBER_SUB_FROM && jb != js->user_jb) { 1874 if(jb->subscription & JABBER_SUB_FROM && jb != js->user_jb) {
1875 act = purple_menu_action_new(_("Cancel Presence Notification"), 1875 act = purple_action_menu_new(_("Cancel Presence Notification"),
1876 PURPLE_CALLBACK(jabber_buddy_cancel_presence_notification), 1876 PURPLE_CALLBACK(jabber_buddy_cancel_presence_notification),
1877 NULL, NULL); 1877 NULL, NULL);
1878 m = g_list_append(m, act); 1878 m = g_list_append(m, act);
1879 } 1879 }
1880 1880
1881 if(!(jb->subscription & JABBER_SUB_TO)) { 1881 if(!(jb->subscription & JABBER_SUB_TO)) {
1882 act = purple_menu_action_new(_("(Re-)Request authorization"), 1882 act = purple_action_menu_new(_("(Re-)Request authorization"),
1883 PURPLE_CALLBACK(jabber_buddy_rerequest_auth), 1883 PURPLE_CALLBACK(jabber_buddy_rerequest_auth),
1884 NULL, NULL); 1884 NULL, NULL);
1885 m = g_list_append(m, act); 1885 m = g_list_append(m, act);
1886 1886
1887 } else if (jb != js->user_jb) { 1887 } else if (jb != js->user_jb) {
1888 1888
1889 /* shouldn't this just happen automatically when the buddy is 1889 /* shouldn't this just happen automatically when the buddy is
1890 removed? */ 1890 removed? */
1891 act = purple_menu_action_new(_("Unsubscribe"), 1891 act = purple_action_menu_new(_("Unsubscribe"),
1892 PURPLE_CALLBACK(jabber_buddy_unsubscribe), 1892 PURPLE_CALLBACK(jabber_buddy_unsubscribe),
1893 NULL, NULL); 1893 NULL, NULL);
1894 m = g_list_append(m, act); 1894 m = g_list_append(m, act);
1895 } 1895 }
1896 1896
1897 if (js->googletalk) { 1897 if (js->googletalk) {
1898 act = purple_menu_action_new(_("Initiate _Chat"), 1898 act = purple_action_menu_new(_("Initiate _Chat"),
1899 PURPLE_CALLBACK(google_buddy_node_chat), 1899 PURPLE_CALLBACK(google_buddy_node_chat),
1900 NULL, NULL); 1900 NULL, NULL);
1901 m = g_list_append(m, act); 1901 m = g_list_append(m, act);
1902 } 1902 }
1903 1903
1910 * people don't tend to have a server or other service there. 1910 * people don't tend to have a server or other service there.
1911 * 1911 *
1912 * TODO: Use disco#info... 1912 * TODO: Use disco#info...
1913 */ 1913 */
1914 if (strchr(name, '@') == NULL) { 1914 if (strchr(name, '@') == NULL) {
1915 act = purple_menu_action_new(_("Log In"), 1915 act = purple_action_menu_new(_("Log In"),
1916 PURPLE_CALLBACK(jabber_buddy_login), 1916 PURPLE_CALLBACK(jabber_buddy_login),
1917 NULL, NULL); 1917 NULL, NULL);
1918 m = g_list_append(m, act); 1918 m = g_list_append(m, act);
1919 act = purple_menu_action_new(_("Log Out"), 1919 act = purple_action_menu_new(_("Log Out"),
1920 PURPLE_CALLBACK(jabber_buddy_logout), 1920 PURPLE_CALLBACK(jabber_buddy_logout),
1921 NULL, NULL); 1921 NULL, NULL);
1922 m = g_list_append(m, act); 1922 m = g_list_append(m, act);
1923 } 1923 }
1924 1924
1928 GList *commands; 1928 GList *commands;
1929 if (!jbr->commands) 1929 if (!jbr->commands)
1930 continue; 1930 continue;
1931 for(commands = jbr->commands; commands; commands = g_list_next(commands)) { 1931 for(commands = jbr->commands; commands; commands = g_list_next(commands)) {
1932 JabberAdHocCommands *cmd = commands->data; 1932 JabberAdHocCommands *cmd = commands->data;
1933 act = purple_menu_action_new(cmd->name, PURPLE_CALLBACK(jabber_adhoc_execute_action), cmd, NULL); 1933 act = purple_action_menu_new(cmd->name, PURPLE_CALLBACK(jabber_adhoc_execute_action), cmd, NULL);
1934 m = g_list_append(m, act); 1934 m = g_list_append(m, act);
1935 } 1935 }
1936 } 1936 }
1937 1937
1938 return m; 1938 return m;

Mercurial Repository: pidgin3

mercurial