diff options
author | Don Seiler <rizzo@gentoo.org> | 2004-08-26 16:22:13 +0000 |
---|---|---|
committer | Don Seiler <rizzo@gentoo.org> | 2004-08-26 16:22:13 +0000 |
commit | 7c94c0bc47d4b3d2c7f38f60e15be037f009c34a (patch) | |
tree | b4548b344aa73ea955c22308fff39dfb47af0a87 /net-im/gaim/files | |
parent | added ~mips ~arm ~amd64 back to KEYWORDS (diff) | |
download | historical-7c94c0bc47d4b3d2c7f38f60e15be037f009c34a.tar.gz historical-7c94c0bc47d4b3d2c7f38f60e15be037f009c34a.tar.bz2 historical-7c94c0bc47d4b3d2c7f38f60e15be037f009c34a.zip |
Removing obsolete version
Diffstat (limited to 'net-im/gaim/files')
-rw-r--r-- | net-im/gaim/files/digest-gaim-0.80 | 1 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-0.81cvs-chatbutton-crashfix.patch | 58 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-0.81cvs-gtkblist_dnd.diff | 37 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-0.81cvs-icon_scaling.diff | 124 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-0.81cvs-irc-ison-lessflood.patch | 39 |
5 files changed, 0 insertions, 259 deletions
diff --git a/net-im/gaim/files/digest-gaim-0.80 b/net-im/gaim/files/digest-gaim-0.80 deleted file mode 100644 index ac68cdb8c1a5..000000000000 --- a/net-im/gaim/files/digest-gaim-0.80 +++ /dev/null @@ -1 +0,0 @@ -MD5 cb68e059ff9667d3156d7abef74b7b19 gaim-0.80.tar.bz2 4589883 diff --git a/net-im/gaim/files/gaim-0.81cvs-chatbutton-crashfix.patch b/net-im/gaim/files/gaim-0.81cvs-chatbutton-crashfix.patch deleted file mode 100644 index d09f734e7d11..000000000000 --- a/net-im/gaim/files/gaim-0.81cvs-chatbutton-crashfix.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: src/gtkblist.c -=================================================================== -RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v -retrieving revision 1.136 -diff -u -p -u -r1.136 gtkblist.c ---- src/gtkblist.c 18 Jul 2004 18:21:26 -0000 1.136 -+++ src/gtkblist.c 21 Jul 2004 16:37:13 -0000 -@@ -2937,6 +2937,8 @@ sign_on_off_cb(GaimConnection *gc, GaimB - - widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Privacy")); - gtk_widget_set_sensitive(widget, gaim_gtk_privacy_is_showable()); -+ -+ gaim_gtk_blist_update_toolbar(); - } - - -@@ -3209,6 +3211,7 @@ static void gaim_gtk_blist_show(GaimBudd - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_im_cb), - gtkblist->treeview); - gtk_tooltips_set_tip(GTK_TOOLTIPS(gtkblist->tooltips), button, _("Send a message to the selected buddy"), NULL); -+ g_object_set_data(G_OBJECT(button), "button_name", "im"); - gtk_widget_show(button); - - button = gaim_pixbuf_button_from_stock(_("Get _Info"), GAIM_STOCK_INFO, GAIM_BUTTON_VERTICAL); -@@ -3218,6 +3221,7 @@ static void gaim_gtk_blist_show(GaimBudd - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_info_cb), - gtkblist->treeview); - gtk_tooltips_set_tip(GTK_TOOLTIPS(gtkblist->tooltips), button, _("Get information on the selected buddy"), NULL); -+ g_object_set_data(G_OBJECT(button), "button_name", "info"); - gtk_widget_show(button); - - button = gaim_pixbuf_button_from_stock(_("_Chat"), GAIM_STOCK_CHAT, GAIM_BUTTON_VERTICAL); -@@ -3226,6 +3230,8 @@ static void gaim_gtk_blist_show(GaimBudd - gtk_size_group_add_widget(sg, button); - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_chat_cb), gtkblist->treeview); - gtk_tooltips_set_tip(GTK_TOOLTIPS(gtkblist->tooltips), button, _("Join a chat room"), NULL); -+ gtk_widget_set_sensitive(button, gaim_gtk_blist_joinchat_is_showable()); -+ g_object_set_data(G_OBJECT(button), "button_name", "chat"); - gtk_widget_show(button); - - button = gaim_pixbuf_button_from_stock(_("_Away"), GAIM_STOCK_ICON_AWAY, GAIM_BUTTON_VERTICAL); -@@ -3234,6 +3240,7 @@ static void gaim_gtk_blist_show(GaimBudd - gtk_size_group_add_widget(sg, button); - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_away_cb), NULL); - gtk_tooltips_set_tip(GTK_TOOLTIPS(gtkblist->tooltips), button, _("Set an away message"), NULL); -+ g_object_set_data(G_OBJECT(button), "button_name", "away"); - gtk_widget_show(button); - - /* this will show the right image/label widgets for us */ -@@ -3425,6 +3432,8 @@ gaim_gtk_blist_update_toolbar_icons (Gtk - gtk_widget_show(widget); - } - else if (GTK_IS_CONTAINER(widget)) { -+ if (GTK_IS_BUTTON(widget) && !strcmp(g_object_get_data(G_OBJECT(widget), "button_name"), "chat")) -+ gtk_widget_set_sensitive(widget, gaim_gtk_blist_joinchat_is_showable()); - gtk_container_foreach(GTK_CONTAINER(widget), - gaim_gtk_blist_update_toolbar_icons, NULL); - } diff --git a/net-im/gaim/files/gaim-0.81cvs-gtkblist_dnd.diff b/net-im/gaim/files/gaim-0.81cvs-gtkblist_dnd.diff deleted file mode 100644 index fb4f68c9dde2..000000000000 --- a/net-im/gaim/files/gaim-0.81cvs-gtkblist_dnd.diff +++ /dev/null @@ -1,37 +0,0 @@ -=================================================================== -RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v -retrieving revision 1.134 -retrieving revision 1.136 -diff -u -r1.134 -r1.136 ---- gaim/gaim/src/gtkblist.c 2004/07/15 01:59:05 1.134 -+++ gaim/gaim/src/gtkblist.c 2004/07/18 18:21:26 1.136 -@@ -3040,12 +3040,14 @@ - GtkSizeGroup *sg; - GtkAccelGroup *accel_group; - GtkTreeSelection *selection; -- GtkTargetEntry gte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW}, -+ GtkTargetEntry dte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW}, - {"application/x-im-contact", 0, DRAG_BUDDY}, - {"text/x-vcard", 0, DRAG_VCARD }, - {"text/uri-list", 0, DRAG_URI}, - {"text/plain", 0, DRAG_TEXT}}; -- -+ GtkTargetEntry ste[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW}, -+ {"application/x-im-contact", 0, DRAG_BUDDY}, -+ {"text/x-vcard", 0, DRAG_VCARD }}; - if (gtkblist && gtkblist->window) { - gtk_widget_show(gtkblist->window); - return; -@@ -3114,10 +3116,10 @@ - - /* Set up dnd */ - gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(gtkblist->treeview), -- GDK_BUTTON1_MASK, gte, NUM_TARGETS, -+ GDK_BUTTON1_MASK, ste, 3, - GDK_ACTION_COPY); - gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(gtkblist->treeview), -- gte, NUM_TARGETS, -+ dte, 5, - GDK_ACTION_COPY | GDK_ACTION_MOVE); - - g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-received", G_CALLBACK(gaim_gtk_blist_drag_data_rcv_cb), NULL); diff --git a/net-im/gaim/files/gaim-0.81cvs-icon_scaling.diff b/net-im/gaim/files/gaim-0.81cvs-icon_scaling.diff deleted file mode 100644 index 71f71d0f4087..000000000000 --- a/net-im/gaim/files/gaim-0.81cvs-icon_scaling.diff +++ /dev/null @@ -1,124 +0,0 @@ -=================================================================== -RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v -retrieving revision 1.135 -retrieving revision 1.136 -diff -u -r1.135 -r1.136 ---- gaim/gaim/src/gtkaccount.c 2004/07/12 19:47:46 1.135 -+++ gaim/gaim/src/gtkaccount.c 2004/07/18 14:57:55 1.136 -@@ -158,6 +158,8 @@ - static void add_account(AccountsWindow *dialog, GaimAccount *account); - static void set_account(GtkListStore *store, GtkTreeIter *iter, - GaimAccount *account); -+static char* -+convert_buddy_icon(GaimAccount *account, const char *path); - - static char * - proto_name(const char *id) -@@ -281,13 +283,13 @@ - - if (dialog->icon_path) - g_free(dialog->icon_path); -- dialog->icon_path = g_strdup(filename); -- gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), filename); -+ dialog->icon_path = convert_buddy_icon(dialog->account, filename); -+ gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), dialog->icon_path); - gtk_widget_show(dialog->icon_entry); - - gtk_widget_destroy(dialog->icon_filesel); - dialog->icon_filesel = NULL; --} -+ } - - static void - #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ -@@ -473,8 +475,8 @@ - *rtmp = '\0'; - if (dialog->icon_path) - g_free(dialog->icon_path); -- dialog->icon_path = g_strdup(tmp); -- gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), tmp); -+ dialog->icon_path = convert_buddy_icon(dialog->account, tmp); -+ gtk_image_set_from_file(GTK_IMAGE(dialog->icon_entry), dialog->icon_path); - gtk_widget_show(dialog->icon_entry); - g_free(tmp); - } -@@ -500,8 +502,8 @@ - } - #endif - --static void --convert_and_set_buddy_icon(GaimAccount *account, const char *path) -+static char* -+convert_buddy_icon(GaimAccount *account, const char *path) - { - #if GTK_CHECK_VERSION(2,2,0) - int width, height; -@@ -544,7 +546,7 @@ - prpl_info->icon_spec.min_height <= height && - prpl_info->icon_spec.max_height >= height))) { /* The icon is the correct size */ - #endif -- gaim_account_set_buddy_icon(account, path); -+ return g_strdup(path); - #if GTK_CHECK_VERSION(2,2,0) - } else { - int i; -@@ -577,7 +579,7 @@ - g_free(random); - gaim_debug_error("buddyicon", "Could not open icon for conversion: %s\n", error->message); - g_error_free(error); -- return; -+ return NULL; - } - for (i = 0; prpl_formats[i]; i++) { - gaim_debug_info("buddyicon", "Converting buddy icon to %s as %s\n", prpl_formats[i], filename); -@@ -585,7 +587,9 @@ - break; - } - if (!error) { -- gaim_account_set_buddy_icon(account, filename); -+ g_free(random); -+ g_object_unref(G_OBJECT(pixbuf)); -+ return filename; - } else { - gaim_debug_error("buddyicon", "Could not convert icon to usable format: %s\n", error->message); - g_error_free(error); -@@ -594,6 +598,7 @@ - g_free(random); - g_object_unref(G_OBJECT(pixbuf)); - } -+ return NULL; - #endif - } - -@@ -1330,14 +1335,8 @@ - - /* Buddy Icon */ - value = dialog->icon_path; -+ gaim_account_set_buddy_icon(dialog->account, value); - -- if (dialog->prpl_info && -- (dialog->prpl_info->icon_spec.format) && -- value != NULL) { -- convert_and_set_buddy_icon(dialog->account, value); -- } else { -- gaim_account_set_buddy_icon(dialog->account, NULL); -- } - /* Remember Password */ - gaim_account_set_remember_password(dialog->account, - gtk_toggle_button_get_active( -=================================================================== -RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v -retrieving revision 1.308 -retrieving revision 1.309 -diff -u -r1.308 -r1.309 ---- gaim/gaim/src/protocols/msn/msn.c 2004/07/17 18:11:10 1.308 -+++ gaim/gaim/src/protocols/msn/msn.c 2004/07/18 14:57:55 1.309 -@@ -1661,7 +1661,7 @@ - OPT_PROTO_MAIL_CHECK, - NULL, /* user_splits */ - NULL, /* protocol_options */ -- {"png", 0, 0, 0, 0, 0}, /* icon_spec */ -+ {"png", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND}, /* icon_spec */ - msn_list_icon, /* list_icon */ - msn_list_emblems, /* list_emblems */ - msn_status_text, /* status_text */ diff --git a/net-im/gaim/files/gaim-0.81cvs-irc-ison-lessflood.patch b/net-im/gaim/files/gaim-0.81cvs-irc-ison-lessflood.patch deleted file mode 100644 index 5ce886c3afa8..000000000000 --- a/net-im/gaim/files/gaim-0.81cvs-irc-ison-lessflood.patch +++ /dev/null @@ -1,39 +0,0 @@ -? src/protocols/irc/ircdiff.patch -Index: src/protocols/irc/irc.c -=================================================================== -RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v -retrieving revision 1.227 -diff -u -p -r1.227 irc.c ---- src/protocols/irc/irc.c 7 Jul 2004 16:31:59 -0000 1.227 -+++ src/protocols/irc/irc.c 17 Jul 2004 16:58:42 -0000 -@@ -123,6 +123,17 @@ static void irc_buddy_append(char *name, - g_string_append_printf(string, "%s ", name); - } - -+static void irc_ison_one(struct irc_conn *irc, struct irc_buddy *ib) -+{ -+ char *buf; -+ -+ ib->flag = FALSE; -+ buf = irc_format(irc, "vn", "ISON", ib->name); -+ irc_send(irc, buf); -+ g_free(buf); -+} -+ -+ - static const char *irc_blist_icon(GaimAccount *a, GaimBuddy *b) - { - return "irc"; -@@ -345,7 +356,11 @@ static void irc_add_buddy(GaimConnection - ib->name = g_strdup(buddy->name); - g_hash_table_insert(irc->buddies, ib->name, ib); - -- irc_blist_timeout(irc); -+ /* if the timer isn't set, this is during signon, so we don't want to flood -+ * ourself off with ISON's, so we don't, but after that we want to know when -+ * someone's online asap */ -+ if (irc->timer) -+ irc_ison_one(irc, ib); - } - - static void irc_remove_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) |