← Back to branch summary

~ted/pidgin/11_buddy_list_really_show.patch

« back to all changes in this revision

Viewing changes to libpurple/protocols/oscar/oscar.c

  • Committer: Bazaar Package Importer
  • Date: 2009-02-23 22:59:35 UTC
  • Revision ID: jamesw@ubuntu.com-20090223225935-0zu41hi7rqw25ex1
Tags: upstream-ubuntu-2.5.4
Import upstream version 2.5.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/oscar/oscar.c
739
739
static char *oscar_icqstatus(int state) {
740
740
        /* Make a cute little string that shows the status of the dude or dudet */
741
741
        if (state & AIM_ICQ_STATE_CHAT)
742
 
                return g_strdup_printf(_("Free For Chat"));
 
742
                return g_strdup(_("Free For Chat"));
743
743
        else if (state & AIM_ICQ_STATE_DND)
744
 
                return g_strdup_printf(_("Do Not Disturb"));
 
744
                return g_strdup(_("Do Not Disturb"));
745
745
        else if (state & AIM_ICQ_STATE_OUT)
746
 
                return g_strdup_printf(_("Not Available"));
 
746
                return g_strdup(_("Not Available"));
747
747
        else if (state & AIM_ICQ_STATE_BUSY)
748
 
                return g_strdup_printf(_("Occupied"));
 
748
                return g_strdup(_("Occupied"));
749
749
        else if (state & AIM_ICQ_STATE_AWAY)
750
 
                return g_strdup_printf(_("Away"));
 
750
                return g_strdup(_("Away"));
751
751
        else if (state & AIM_ICQ_STATE_WEBAWARE)
752
 
                return g_strdup_printf(_("Web Aware"));
 
752
                return g_strdup(_("Web Aware"));
753
753
        else if (state & AIM_ICQ_STATE_INVISIBLE)
754
 
                return g_strdup_printf(_("Invisible"));
 
754
                return g_strdup(_("Invisible"));
755
755
        else
756
 
                return g_strdup_printf(_("Online"));
 
756
                return g_strdup(_("Online"));
757
757
}
758
758
 
759
759
static void
1653
1653
        }
1654
1654
        if (in != '\n') {
1655
1655
                char buf[256];
1656
 
                GHashTable *ui_info = purple_core_get_ui_info();                
1657
 
                g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  You may want to use TOC until "
1658
 
                        "this is fixed.  Check %s for updates."),
1659
 
                                   ((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
 
1656
                GHashTable *ui_info = purple_core_get_ui_info();
 
1657
                g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  "
 
1658
                                "If so, check %s for updates."),
 
1659
                                ((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
1660
1660
                purple_notify_warning(pos->gc, NULL,
1661
1661
                                                        _("Unable to get a valid AIM login hash."),
1662
1662
                                                        buf);
6200
6200
                menu = g_list_prepend(menu, act);
6201
6201
        }
6202
6202
 
6203
 
        act = purple_menu_action_new(_("Edit Buddy Comment"),
6204
 
                                   PURPLE_CALLBACK(oscar_buddycb_edit_comment),
6205
 
                                   NULL, NULL);
6206
 
        menu = g_list_prepend(menu, act);
 
6203
        if (purple_buddy_get_group(buddy) != NULL)
 
6204
        {
 
6205
                /* We only do this if the user is in our buddy list */
 
6206
                act = purple_menu_action_new(_("Edit Buddy Comment"),
 
6207
                                           PURPLE_CALLBACK(oscar_buddycb_edit_comment),
 
6208
                                           NULL, NULL);
 
6209
                menu = g_list_prepend(menu, act);
 
6210
        }
6207
6211
 
6208
6212
#if 0
6209
6213
        if (od->icq)
6237
6241
#endif
6238
6242
        }
6239
6243
 
6240
 
        if (od->ssi.received_data)
 
6244
        if (od->ssi.received_data && purple_buddy_get_group(buddy) != NULL)
6241
6245
        {
6242
6246
                char *gname;
6243
6247
                gname = aim_ssi_itemlist_findparentname(od->ssi.local, buddy->name);