Menu
▾
▴
[Gaim-commits] CVS: gaim/src gtkblist.c,1.267,1.268 gtkblist.h,1.34,1.35 gtkconv.c,1.574,1.575 gtkconv.h,1.66,1.67 gtkdialogs.c,1.57,1.58 gtkdialogs.h,1.16,1.17 prpl.c,1.151,1.152 prpl.h,1.198,1.199 server.c,1.463,1.464 server.h,1.29,1.30 status.c,1.62,1.63 status.h,1.25,1.26
|
From: Sean E. <sea...@us...> - 2005-08-14 03:50:47
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27388 Modified Files: gtkblist.c gtkblist.h gtkconv.c gtkconv.h gtkdialogs.c gtkdialogs.h prpl.c prpl.h server.c server.h status.c status.h Log Message: Removed warning from core. I think you should be able to see others' warning levels in the tooltip, but I haven't managed to warn myself from any client. Being able to warn others will be dependent on protocol-specific convo menus. Index: gtkblist.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v retrieving revision 1.267 retrieving revision 1.268 diff -u -d -p -r1.267 -r1.268 --- gtkblist.c 13 Aug 2005 22:09:32 -0000 1.267 +++ gtkblist.c 14 Aug 2005 03:50:34 -0000 1.268 @@ -2792,7 +2792,6 @@ static char *gaim_get_tooltip_text(GaimB char *tmp; gboolean idle; time_t idle_secs, signon; - unsigned int warning_level; if (GAIM_BLIST_NODE_IS_CONTACT(node)) { @@ -2906,14 +2905,6 @@ static char *gaim_get_tooltip_text(GaimB } } - /* Warning */ - warning_level = gaim_presence_get_warning_level(presence); - if (warning_level > 0) - { - tmp = g_strdup_printf(_("%d%%"), warning_level); - g_string_append_printf(str, _("\n<b>Warned:</b> %s"), tmp); - g_free(tmp); - } /* Offline? */ if (!GAIM_BUDDY_IS_ONLINE(b)) { @@ -3114,8 +3105,7 @@ static gchar *gaim_gtk_blist_get_name_ma GaimContact *contact; GaimPresence *presence; struct _gaim_gtk_blist_node *gtkcontactnode = NULL; - char *idletime = NULL, *warning = NULL, *statustext = NULL; - unsigned int warning_level; + char *idletime = NULL, *statustext = NULL; time_t t; /* XXX Clean up this crap */ @@ -3214,50 +3204,35 @@ static gchar *gaim_gtk_blist_get_name_ma idletime = g_strdup(_("Idle ")); } - warning_level = gaim_presence_get_warning_level(presence); - - if (warning_level > 0) { - warning = g_strdup_printf(_("Warned (%d%%) "), warning_level); - } - if(!GAIM_BUDDY_IS_ONLINE(b) && !statustext) statustext = g_strdup(_("Offline ")); if (gaim_presence_is_idle(presence) && !selected) { text = g_strdup_printf("<span color='%s'>%s</span>\n" - "<span color='%s' size='smaller'>%s%s%s%s%s</span>", + "<span color='%s' size='smaller'>%s%s%s</span>", dim_grey(), esc, dim_grey(), statustext != NULL ? statustext : "", (idletime != NULL && statustext != NULL) ? " - " : "", - idletime != NULL ? idletime : "", - (warning != NULL && (statustext != NULL || idletime != NULL)) ? " - " : "", - warning != NULL ? warning : ""); - } else if (statustext == NULL && idletime == NULL && warning == NULL && - GAIM_BUDDY_IS_ONLINE(b)) { + idletime != NULL ? idletime : ""); + } else if (statustext == NULL && idletime == NULL && GAIM_BUDDY_IS_ONLINE(b)) { text = g_strdup(esc); } else { if (selected) text = g_strdup_printf("%s\n" - "<span size='smaller'>%s%s%s%s%s</span>", esc, + "<span size='smaller'>%s%s%s</span>", esc, statustext != NULL ? statustext : "", (idletime != NULL && statustext != NULL) ? " - " : "", - idletime != NULL ? idletime : "", - (warning != NULL && (statustext != NULL || idletime != NULL)) ? " - " : "", - warning != NULL ? warning : ""); + idletime != NULL ? idletime : ""); else text = g_strdup_printf("%s\n" - "<span color='%s' size='smaller'>%s%s%s%s%s</span>", esc, + "<span color='%s' size='smaller'>%s%s%s</span>", esc, dim_grey(), statustext != NULL ? statustext : "", (idletime != NULL && statustext != NULL) ? " - " : "", - idletime != NULL ? idletime : "", - (warning != NULL && (statustext != NULL || idletime != NULL)) ? " - " : "", - warning != NULL ? warning : ""); + idletime != NULL ? idletime : ""); } if (idletime) g_free(idletime); - if (warning) - g_free(warning); if (statustext) g_free(statustext); if (esc) @@ -3440,10 +3415,8 @@ void gaim_gtk_blist_update_columns() if (gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons")) { gtk_tree_view_column_set_visible(gtkblist->buddy_icon_column, TRUE); gtk_tree_view_column_set_visible(gtkblist->idle_column, FALSE); - gtk_tree_view_column_set_visible(gtkblist->warning_column, FALSE); } else { gtk_tree_view_column_set_visible(gtkblist->idle_column, TRUE); - gtk_tree_view_column_set_visible(gtkblist->warning_column, TRUE); gtk_tree_view_column_set_visible(gtkblist->buddy_icon_column, FALSE); } } @@ -3591,8 +3564,8 @@ static void gaim_gtk_blist_show(GaimBudd gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtkblist->treemodel = gtk_tree_store_new(BLIST_COLUMNS, - GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN, G_TYPE_STRING, - G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER); + GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN, + G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER); gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel)); gtk_widget_show(gtkblist->treeview); @@ -3653,11 +3626,6 @@ static void gaim_gtk_blist_show(GaimBudd gtk_tree_view_append_column(GTK_TREE_VIEW(gtkblist->treeview), gtkblist->idle_column); g_object_set(rend, "xalign", 1.0, "ypad", 0, NULL); - rend = gtk_cell_renderer_text_new(); - gtkblist->warning_column = gtk_tree_view_column_new_with_attributes("Warning", rend, "markup", WARNING_COLUMN, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(gtkblist->treeview), gtkblist->warning_column); - g_object_set(rend, "xalign", 1.0, "ypad", 0, NULL); - rend = gtk_cell_renderer_pixbuf_new(); gtkblist->buddy_icon_column = gtk_tree_view_column_new_with_attributes("Buddy Icon", rend, "pixbuf", BUDDY_ICON_COLUMN, NULL); g_object_set(rend, "xalign", 1.0, "ypad", 0, NULL); @@ -3981,8 +3949,7 @@ static void buddy_node(GaimBuddy *buddy, GaimPresence *presence; GdkPixbuf *status, *avatar; char *mark; - char *warning = NULL, *idle = NULL; - unsigned int warning_level; + char *idle = NULL; gboolean selected = (gtkblist->selected_node == node); presence = gaim_buddy_get_presence(buddy); @@ -4013,20 +3980,8 @@ static void buddy_node(GaimBuddy *buddy, } } - warning_level = gaim_presence_get_warning_level(presence); - - if (warning_level > 0) - warning = g_strdup_printf("%d%%", warning_level); - if (gaim_presence_is_idle(presence)) { - if (warning && !selected) { - char *w2 = g_strdup_printf("<span color='%s'>%s</span>", - dim_grey(), warning); - g_free(warning); - warning = w2; - } - if (idle && !selected) { char *i2 = g_strdup_printf("<span color='%s'>%s</span>", dim_grey(), idle); @@ -4039,7 +3994,6 @@ static void buddy_node(GaimBuddy *buddy, STATUS_ICON_COLUMN, status, STATUS_ICON_VISIBLE_COLUMN, TRUE, NAME_COLUMN, mark, - WARNING_COLUMN, warning, IDLE_COLUMN, idle, BUDDY_ICON_COLUMN, avatar, -1); @@ -4047,8 +4001,6 @@ static void buddy_node(GaimBuddy *buddy, g_free(mark); if(idle) g_free(idle); - if(warning) - g_free(warning); if(status) g_object_unref(status); if(avatar) @@ -4095,7 +4047,6 @@ static void gaim_gtk_blist_update_contac STATUS_ICON_COLUMN, status, STATUS_ICON_VISIBLE_COLUMN, TRUE, NAME_COLUMN, mark, - WARNING_COLUMN, NULL, IDLE_COLUMN, NULL, BUDDY_ICON_COLUMN, NULL, -1); @@ -4237,7 +4188,7 @@ static void gaim_gtk_blist_destroy(GaimB gtkblist->window = gtkblist->vbox = gtkblist->treeview = NULL; gtkblist->treemodel = NULL; gtkblist->idle_column = NULL; - gtkblist->warning_column = gtkblist->buddy_icon_column = NULL; + gtkblist->buddy_icon_column = NULL; g_object_unref(G_OBJECT(gtkblist->ift)); protomenu = NULL; pluginmenu = NULL; Index: gtkblist.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkblist.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -p -r1.34 -r1.35 --- gtkblist.h 22 Jun 2005 22:41:59 -0000 1.34 +++ gtkblist.h 14 Aug 2005 03:50:34 -0000 1.35 @@ -31,7 +31,6 @@ enum { STATUS_ICON_COLUMN, STATUS_ICON_VISIBLE_COLUMN, NAME_COLUMN, - WARNING_COLUMN, IDLE_COLUMN, BUDDY_ICON_COLUMN, NODE_COLUMN, Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.574 retrieving revision 1.575 diff -u -d -p -r1.574 -r1.575 --- gtkconv.c 13 Aug 2005 22:09:32 -0000 1.574 +++ gtkconv.c 14 Aug 2005 03:50:34 -0000 1.575 @@ -1266,21 +1266,6 @@ menu_invite_cb(gpointer data, guint acti } static void -menu_warn_cb(gpointer data, guint action, GtkWidget *widget) -{ - GaimConvWindow *win = (GaimConvWindow *)data; - GaimConversation *conv; - GaimConnection *gc; - - conv = gaim_conv_window_get_active_conversation(win); - gc = gaim_conversation_get_gc(conv); - - gaim_gtkdialogs_warn(gc, gaim_conversation_get_name(conv)); - - gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); -} - -static void menu_block_cb(gpointer data, guint action, GtkWidget *widget) { GaimConvWindow *win = (GaimConvWindow *)data; @@ -2800,7 +2785,6 @@ gray_stuff_out(GaimGtkConversation *gtkc gtk_widget_show(gtkwin->menu.send_file); gtk_widget_show(gtkwin->menu.add_pounce); gtk_widget_show(gtkwin->menu.get_info); - gtk_widget_show(gtkwin->menu.warn); gtk_widget_hide(gtkwin->menu.invite); gtk_widget_show(gtkwin->menu.alias); gtk_widget_show(gtkwin->menu.block); @@ -2824,7 +2808,6 @@ gray_stuff_out(GaimGtkConversation *gtkc gtk_widget_hide(gtkwin->menu.send_file); gtk_widget_hide(gtkwin->menu.add_pounce); gtk_widget_hide(gtkwin->menu.get_info); - gtk_widget_hide(gtkwin->menu.warn); gtk_widget_show(gtkwin->menu.invite); gtk_widget_show(gtkwin->menu.alias); gtk_widget_hide(gtkwin->menu.block); @@ -2876,7 +2859,6 @@ gray_stuff_out(GaimGtkConversation *gtkc gtk_widget_set_sensitive(gtkwin->menu.view_log, TRUE); gtk_widget_set_sensitive(gtkwin->menu.add_pounce, TRUE); gtk_widget_set_sensitive(gtkwin->menu.get_info, (prpl_info->get_info != NULL)); - gtk_widget_set_sensitive(gtkwin->menu.warn, (prpl_info->warn != NULL)); gtk_widget_set_sensitive(gtkwin->menu.invite, (prpl_info->chat_invite != NULL)); gtk_widget_set_sensitive(gtkwin->menu.block, (prpl_info->add_deny != NULL)); gtk_widget_set_sensitive(gtkwin->menu.insert_link, (conv->features & GAIM_CONNECTION_HTML)); @@ -2913,7 +2895,6 @@ gray_stuff_out(GaimGtkConversation *gtkc gtk_widget_set_sensitive(gtkwin->menu.send_file, FALSE); gtk_widget_set_sensitive(gtkwin->menu.add_pounce, TRUE); gtk_widget_set_sensitive(gtkwin->menu.get_info, FALSE); - gtk_widget_set_sensitive(gtkwin->menu.warn, FALSE); gtk_widget_set_sensitive(gtkwin->menu.invite, FALSE); gtk_widget_set_sensitive(gtkwin->menu.alias, FALSE); gtk_widget_set_sensitive(gtkwin->menu.block, FALSE); @@ -3663,8 +3644,6 @@ static GtkItemFactoryEntry menu_items[] 0, NULL }, { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, "<StockItem>", GAIM_STOCK_INFO }, - { N_("/Conversation/_Warn..."), NULL, menu_warn_cb, 0, - "<StockItem>", GAIM_STOCK_WARN }, { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, "<StockItem>", GAIM_STOCK_INVITE }, @@ -3759,10 +3738,6 @@ setup_menubar(GaimConvWindow *win) gtk_item_factory_get_widget(gtkwin->menu.item_factory, N_("/Conversation/Get Info")); - gtkwin->menu.warn = - gtk_item_factory_get_widget(gtkwin->menu.item_factory, - N_("/Conversation/Warn...")); - gtkwin->menu.invite = gtk_item_factory_get_widget(gtkwin->menu.item_factory, N_("/Conversation/Invite...")); Index: gtkconv.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.h,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -p -r1.66 -r1.67 --- gtkconv.h 25 Jul 2005 19:36:44 -0000 1.66 +++ gtkconv.h 14 Aug 2005 03:50:34 -0000 1.67 @@ -77,7 +77,6 @@ struct _GaimGtkWindow GtkWidget *send_file; GtkWidget *add_pounce; GtkWidget *get_info; - GtkWidget *warn; GtkWidget *invite; GtkWidget *alias; Index: gtkdialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -p -r1.57 -r1.58 --- gtkdialogs.c 12 Aug 2005 23:53:28 -0000 1.57 +++ gtkdialogs.c 14 Aug 2005 03:50:34 -0000 1.58 @@ -42,13 +42,6 @@ static GList *dialogwindows = NULL; static GtkWidget *about = NULL; -struct warning { - GtkWidget *window; - GtkWidget *anon; - char *who; - GaimConnection *gc; -}; - struct developer { char *name; char *role; @@ -713,85 +706,6 @@ gaim_gtkdialogs_log(void) } static void -gaim_gtkdialogs_warn_cb(GtkWidget *widget, gint resp, struct warning *w) -{ - if (resp == GTK_RESPONSE_OK) - serv_warn(w->gc, w->who, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->anon))); - - dialogwindows = g_list_remove(dialogwindows, w->window); - gtk_widget_destroy(w->window); - - g_free(w->who); - g_free(w); -} - -/* - * TODO - Make this use the request API, if possible. - */ -void -gaim_gtkdialogs_warn(GaimConnection *gc, const char *who) -{ - gchar *labeltext; - GtkWidget *hbox, *vbox; - GtkWidget *label; - GtkWidget *img; - struct warning *w; - - g_return_if_fail(gc != NULL); - g_return_if_fail(who != NULL); - - w = g_new0(struct warning, 1); - w->who = g_strdup(who); - w->gc = gc; - - w->window = gtk_dialog_new_with_buttons(_("Warn User"), NULL, 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GAIM_STOCK_WARN, GTK_RESPONSE_OK, NULL); - gtk_dialog_set_default_response (GTK_DIALOG(w->window), GTK_RESPONSE_OK); - g_signal_connect(G_OBJECT(w->window), "response", G_CALLBACK(gaim_gtkdialogs_warn_cb), w); - - gtk_container_set_border_width (GTK_CONTAINER(w->window), GAIM_HIG_BOX_SPACE); - gtk_window_set_resizable(GTK_WINDOW(w->window), FALSE); - gtk_dialog_set_has_separator(GTK_DIALOG(w->window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(w->window)->vbox), GAIM_HIG_BORDER); - gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), GAIM_HIG_BOX_SPACE); - - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), hbox); - - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); - - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(hbox), vbox); - labeltext = g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n\n" - "This will increase %s's warning level and he or she will be subject to harsher rate limiting.\n"), who, who); - label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), labeltext); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - g_free(labeltext); - - w->anon = gtk_check_button_new_with_mnemonic(_("Warn _anonymously?")); - gtk_box_pack_start(GTK_BOX(vbox), w->anon, FALSE, FALSE, 0); - - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_MENU); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); - labeltext = _("<b>Anonymous warnings are less severe.</b>"); - label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), labeltext); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - dialogwindows = g_list_prepend(dialogwindows, w->window); - gtk_widget_show_all(w->window); -} - -static void gaim_gtkdialogs_alias_contact_cb(GaimContact *contact, const char *new_alias) { gaim_contact_set_alias(contact, new_alias); Index: gtkdialogs.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -p -r1.16 -r1.17 --- gtkdialogs.h 28 Jun 2005 20:36:20 -0000 1.16 +++ gtkdialogs.h 14 Aug 2005 03:50:34 -0000 1.17 @@ -36,7 +36,6 @@ void gaim_gtkdialogs_im(); void gaim_gtkdialogs_im_with_user(GaimAccount *, const char *); void gaim_gtkdialogs_info(); void gaim_gtkdialogs_log(); -void gaim_gtkdialogs_warn(GaimConnection *, const char *); void gaim_gtkdialogs_alias_contact(GaimContact *); void gaim_gtkdialogs_alias_buddy(GaimBuddy *); void gaim_gtkdialogs_alias_chat(GaimChat *); Index: prpl.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/prpl.c,v retrieving revision 1.151 retrieving revision 1.152 diff -u -d -p -r1.151 -r1.152 --- prpl.c 25 Apr 2005 04:03:12 -0000 1.151 +++ prpl.c 14 Aug 2005 03:50:34 -0000 1.152 @@ -185,43 +185,6 @@ gaim_prpl_got_account_status(GaimAccount } void -gaim_prpl_got_account_warning_level(GaimAccount *account, const char *username, - unsigned int level) -{ - GaimPresence *presence; - unsigned int old_level; - gchar *buf; - - g_return_if_fail(account != NULL); - - presence = gaim_account_get_presence(account); - - gaim_signal_emit(gaim_accounts_get_handle(), "account-warned", - account, username, level); - - old_level = gaim_presence_get_warning_level(presence); - gaim_presence_set_warning_level(presence, level); - - if (old_level >= level) - return; - - if (username == NULL) - buf = g_strdup_printf(_("%s has just been warned by an anonymous " - "person.\nYour new warning level is %d%%"), - gaim_account_get_username(account), - level); - else - buf = g_strdup_printf(_("%s has just been warned by %s.\n" - "Your new warning level is %d%%"), - gaim_account_get_username(account), - username, level); - - gaim_notify_info(NULL, NULL, buf, NULL); - - g_free(buf); -} - -void gaim_prpl_got_user_idle(GaimAccount *account, const char *name, gboolean idle, time_t idle_time) { @@ -316,28 +279,6 @@ gaim_prpl_got_user_status(GaimAccount *a } void -gaim_prpl_got_user_warning_level(GaimAccount *account, const char *name, - unsigned int level) -{ - GSList *l; - - g_return_if_fail(account != NULL); - g_return_if_fail(name != NULL); - - for (l = gaim_find_buddies(account, name); l != NULL; l = l->next) - { - GaimBuddy *buddy; - GaimPresence *presence; - - buddy = (GaimBuddy *)l->data; - - presence = gaim_buddy_get_presence(buddy); - - gaim_presence_set_warning_level(presence, level); - } -} - -void gaim_prpl_change_account_status(GaimAccount *account, GaimStatus *old_status, GaimStatus *new_status) { Index: prpl.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/prpl.h,v retrieving revision 1.198 retrieving revision 1.199 diff -u -d -p -r1.198 -r1.199 --- prpl.h 28 Jun 2005 20:36:20 -0000 1.198 +++ prpl.h 14 Aug 2005 03:50:34 -0000 1.199 @@ -235,7 +235,6 @@ struct _GaimPluginProtocolInfo void (*rem_permit)(GaimConnection *, const char *name); void (*rem_deny)(GaimConnection *, const char *name); void (*set_permit_deny)(GaimConnection *); - void (*warn)(GaimConnection *, const char *who, gboolean anonymous); void (*join_chat)(GaimConnection *, GHashTable *components); void (*reject_chat)(GaimConnection *, GHashTable *components); char *(*get_chat_name)(GHashTable *components); @@ -343,21 +342,6 @@ void gaim_prpl_got_account_login_time(Ga void gaim_prpl_got_account_status(GaimAccount *account, const char *status_id, const char *attr_id, ...); - -/** - * Notifies Gaim that an account's warning level has changed. - * - * This is meant to be called from protocol plugins. - * - * @param account The account the user is on. - * @param username The user that warned the account. - * @param level The new warning level. - */ -void gaim_prpl_got_account_warning_level(GaimAccount *account, - const char *username, - unsigned int level); - - /** * Notifies Gaim that a user's idle state and time have changed. * @@ -399,19 +383,6 @@ void gaim_prpl_got_user_login_time(GaimA */ void gaim_prpl_got_user_status(GaimAccount *account, const char *name, const char *status_id, const char *attr_id, ...); - -/** - * Notifies Gaim that a user's warning level has changed. - * - * This is meant to be called from protocol plugins. - * - * @param account The account the user is on. - * @param name The screen name of the user. - * @param level The new warning level. - */ -void gaim_prpl_got_user_warning_level(GaimAccount *account, const char *name, - unsigned int level); - /** * Informs the server that an account's status changed. * Index: server.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/server.c,v retrieving revision 1.463 retrieving revision 1.464 diff -u -d -p -r1.463 -r1.464 --- server.c 7 Jul 2005 02:47:48 -0000 1.463 +++ server.c 14 Aug 2005 03:50:34 -0000 1.464 @@ -454,16 +454,6 @@ void serv_set_idle(GaimConnection *g, in prpl_info->set_idle(g, time); } -void serv_warn(GaimConnection *g, const char *name, gboolean anonymous) -{ - GaimPluginProtocolInfo *prpl_info = NULL; - - if (g != NULL && g->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl); - - if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->warn) - prpl_info->warn(g, name, anonymous); -} void serv_join_chat(GaimConnection *g, GHashTable *data) { Index: server.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/server.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -p -r1.29 -r1.30 --- server.h 19 Jul 2005 05:20:55 -0000 1.29 +++ server.h 14 Aug 2005 03:50:34 -0000 1.30 @@ -51,7 +51,6 @@ void serv_add_deny(GaimConnection *, con void serv_rem_permit(GaimConnection *, const char *); void serv_rem_deny(GaimConnection *, const char *); void serv_set_permit_deny(GaimConnection *); -void serv_warn(GaimConnection *, const char *, gboolean); void serv_join_chat(GaimConnection *, GHashTable *); void serv_reject_chat(GaimConnection *, GHashTable *); void serv_chat_invite(GaimConnection *, int, const char *, const char *); Index: status.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/status.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -p -r1.62 -r1.63 --- status.c 13 Aug 2005 22:09:32 -0000 1.62 +++ status.c 14 Aug 2005 03:50:34 -0000 1.63 @@ -71,8 +71,6 @@ struct _GaimPresence time_t idle_time; time_t login_time; - unsigned int warning_level; - GList *statuses; GHashTable *status_table; @@ -1382,35 +1380,6 @@ gaim_presence_set_login_time(GaimPresenc presence->login_time = login_time; } -void -gaim_presence_set_warning_level(GaimPresence *presence, unsigned int level) -{ - g_return_if_fail(presence != NULL); - g_return_if_fail(level <= 100); - - if (presence->warning_level == level) - return; - - presence->warning_level = level; - - if (gaim_presence_get_context(presence) == GAIM_PRESENCE_CONTEXT_BUDDY) - { - GaimBlistUiOps *ops = gaim_get_blist()->ui_ops; - - if (ops != NULL && ops->update != NULL) - { - const GList *l; - - for (l = gaim_presence_get_buddies(presence); - l != NULL; - l = l->next) - { - ops->update(gaim_get_blist(), (GaimBlistNode *)l->data); - } - } - } -} - GaimPresenceContext gaim_presence_get_context(const GaimPresence *presence) { @@ -1586,14 +1555,6 @@ gaim_presence_get_idle_time(const GaimPr return presence->idle_time; } -unsigned int -gaim_presence_get_warning_level(const GaimPresence *presence) -{ - g_return_val_if_fail(presence != NULL, 0); - - return presence->warning_level; -} - time_t gaim_presence_get_login_time(const GaimPresence *presence) { Index: status.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/status.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -p -r1.25 -r1.26 --- status.h 13 Aug 2005 05:22:09 -0000 1.25 +++ status.h 14 Aug 2005 03:50:34 -0000 1.26 @@ -820,15 +820,6 @@ void gaim_presence_set_idle(GaimPresence */ void gaim_presence_set_login_time(GaimPresence *presence, time_t login_time); -/** - * Sets the warning level on a presence. - * - * @param presence The presence. - * @param level The warning level. An integer between 0 and 100 - * (inclusive) representing the percentage warned. - */ -void gaim_presence_set_warning_level(GaimPresence *presence, - unsigned int level); /** * Returns the presence's context. @@ -970,15 +961,6 @@ gboolean gaim_presence_is_idle(const Gai time_t gaim_presence_get_idle_time(const GaimPresence *presence); /** - * Returns the presence's warning level. - * - * @param presence The presence. - * - * @return The presence's warning level. - */ -unsigned int gaim_presence_get_warning_level(const GaimPresence *presence); - -/** * Returns the presence's login time. * * @param presence The presence. |