summaryrefslogtreecommitdiff
path: root/packages/gaim
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-02-20 00:34:07 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-02-20 00:34:07 +0000
commitc9e8762b3c2c940689bee98c2f78af69b47407e2 (patch)
tree9d7aac6435d99613b91400f646b50e963c580980 /packages/gaim
parenta749e1f719d9e5d992865b3f421e5da139053c56 (diff)
gaim: moved gaim to packages/obsolete and pidgin to its own directory. Fixes 2374.
Diffstat (limited to 'packages/gaim')
-rw-r--r--packages/gaim/.mtn2git_empty0
-rw-r--r--packages/gaim/files/.mtn2git_empty0
-rw-r--r--packages/gaim/files/01-optional-icons-in-dialogs.patch514
-rw-r--r--packages/gaim/files/02-request-field-dialogs.patch116
-rw-r--r--packages/gaim/files/03-blist-dialogs.patch240
-rw-r--r--packages/gaim/files/04-saved-status-dialogs.patch40
-rw-r--r--packages/gaim/files/05-statusbox-icon-size.patch11
-rw-r--r--packages/gaim/files/06-account-dialogs.patch219
-rw-r--r--packages/gaim/files/07-roomlist-dialog.patch67
-rw-r--r--packages/gaim/files/08-prefs-dialog.patch64
-rw-r--r--packages/gaim/files/09-filetransfer-dialog.patch52
-rw-r--r--packages/gaim/files/10-pda-default-settings.patch13
-rw-r--r--packages/gaim/files/define-pda-mode.patch36
-rw-r--r--packages/gaim/files/desktop-name-2.0.0.patch27
-rw-r--r--packages/gaim/files/desktop-name.patch10
-rw-r--r--packages/gaim/files/desktop-name_1.4.0.patch11
-rw-r--r--packages/gaim/files/desktop-name_1.5.0.patch11
-rw-r--r--packages/gaim/files/docklet-icon-size.patch13
-rw-r--r--packages/gaim/files/gaim-OE-branding.patch11
-rw-r--r--packages/gaim/files/gevolution-eds-dbus.patch53
-rw-r--r--packages/gaim/files/gtk-deprecated-2.0.0.patch13
-rw-r--r--packages/gaim/files/no-superimposed-version-on-logo.patch19
-rw-r--r--packages/gaim/files/purple-OE-branding.patch14
-rw-r--r--packages/gaim/files/series14
-rw-r--r--packages/gaim/gaim.inc35
-rw-r--r--packages/gaim/gaim_1.0.3.bb6
-rw-r--r--packages/gaim/gaim_1.1.0.bb6
-rw-r--r--packages/gaim/gaim_1.1.1.bb6
-rw-r--r--packages/gaim/gaim_1.1.2.bb9
-rw-r--r--packages/gaim/gaim_1.4.0.bb9
-rw-r--r--packages/gaim/gaim_1.5.0.bb9
-rw-r--r--packages/gaim/gaim_2.0.0-cvs-mco1.bb44
-rw-r--r--packages/gaim/pidgin.inc85
-rw-r--r--packages/gaim/pidgin/.mtn2git_empty0
-rw-r--r--packages/gaim/pidgin/gconf-no-errors.patch12
-rw-r--r--packages/gaim/pidgin/pidgin.desktop-set-icon.patch11
-rw-r--r--packages/gaim/pidgin/sanitize-configure.ac.patch33
-rw-r--r--packages/gaim/pidgin_2.0.2.bb9
-rw-r--r--packages/gaim/pidgin_2.1.1.bb10
-rw-r--r--packages/gaim/pidgin_2.2.1.bb10
40 files changed, 0 insertions, 1862 deletions
diff --git a/packages/gaim/.mtn2git_empty b/packages/gaim/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gaim/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gaim/files/.mtn2git_empty b/packages/gaim/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gaim/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gaim/files/01-optional-icons-in-dialogs.patch b/packages/gaim/files/01-optional-icons-in-dialogs.patch
deleted file mode 100644
index 260dcf364f..0000000000
--- a/packages/gaim/files/01-optional-icons-in-dialogs.patch
+++ /dev/null
@@ -1,514 +0,0 @@
-Index: gaim/src/gtkblist.c
-===================================================================
---- gaim.orig/src/gtkblist.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkblist.c 2005-08-21 02:32:13.989658832 +0200
-@@ -873,16 +873,23 @@
- void
- gaim_gtk_blist_joinchat_show(void)
- {
-- GtkWidget *hbox, *vbox;
-+ GtkWidget *vbox;
- GtkWidget *rowbox;
- GtkWidget *label;
-+ GtkWidget *pri_label;
- GaimGtkBuddyList *gtkblist;
-+ GtkWidget *sw;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img = NULL;
-+#endif
- GaimGtkJoinChatData *data = NULL;
-
- gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
- data = g_new0(GaimGtkJoinChatData, 1);
-
- data->window = gtk_dialog_new_with_buttons(_("Join a Chat"),
-@@ -897,6 +904,7 @@
- GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE);
- gtk_window_set_role(GTK_WINDOW(data->window), "join_chat");
-
-+#if ICONS_IN_DIALOGS
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-@@ -905,6 +913,9 @@
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
- gtk_container_add(GTK_CONTAINER(hbox), vbox);
-+#else
-+ vbox = GTK_DIALOG(data->window)->vbox;
-+#endif
-
- label = gtk_label_new(_("Please enter the appropriate information "
- "about the chat you would like to join.\n"));
-@@ -4304,9 +4315,13 @@
- {
- GtkWidget *table;
- GtkWidget *label;
-+ GtkWidget *pri_label;
- GtkWidget *hbox;
- GtkWidget *vbox;
-+ GtkWidget *sw;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img;
-+#endif
- GaimGtkBuddyList *gtkblist;
- GaimGtkAddBuddyData *data = g_new0(GaimGtkAddBuddyData, 1);
-
-@@ -4315,8 +4330,10 @@
- ? account
- : gaim_connection_get_account(gaim_connections_get_all()->data));
-
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
-
- gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
-
-@@ -4335,6 +4352,7 @@
- gtk_window_set_type_hint(GTK_WINDOW(data->window),
- GDK_WINDOW_TYPE_HINT_DIALOG);
-
-+#if ICONS_IN_DIALOGS
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-@@ -4342,6 +4360,9 @@
-
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(hbox), vbox);
-+#else
-+ vbox = GTK_DIALOG(data->window)->vbox;
-+#endif
-
- label = gtk_label_new(
- _("Please enter the screen name of the person you would like "
-@@ -4663,10 +4684,14 @@
- GList *l;
- GaimConnection *gc;
- GtkWidget *label;
-+ GtkWidget *pri_label;
- GtkWidget *rowbox;
-- GtkWidget *hbox;
- GtkWidget *vbox;
-+ GtkWidget *sw;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
-
- if (account != NULL) {
- gc = gaim_account_get_connection(account);
-@@ -4698,8 +4723,10 @@
- data->account = account;
- data->default_chat_name = g_strdup(name);
-
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
-
- gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
-
-@@ -4720,6 +4747,7 @@
- gtk_window_set_type_hint(GTK_WINDOW(data->window),
- GDK_WINDOW_TYPE_HINT_DIALOG);
-
-+#if ICONS_IN_DIALOGS
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-@@ -4727,6 +4755,9 @@
-
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_add(GTK_CONTAINER(hbox), vbox);
-+#else
-+ vbox = GTK_DIALOG(data->window)->vbox;
-+#endif
-
- label = gtk_label_new(
- _("Please enter an alias, and the appropriate information "
-Index: gaim/src/gtkconn.c
-===================================================================
---- gaim.orig/src/gtkconn.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkconn.c 2005-08-19 23:27:18.000000000 +0200
-@@ -371,7 +371,10 @@
-
- /* Build the window if it isn't there yet */
- if (!disconnect_window) {
-- GtkWidget *hbox, *vbox, *img;
-+ GtkWidget *hbox, *vbox;
-+ #if ICONS_IN_DIALOGS
-+ GtkWidget *img;
-+ #endif
- GtkCellRenderer *rend, *rend2;
-
- disconnect_window = g_new0(struct disconnect_window, 1);
-@@ -384,6 +387,7 @@
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BOX_SPACE);
-
-+#if ICONS_IN_DIALOGS
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), hbox);
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
-@@ -392,6 +396,9 @@
-
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = GTK_DIALOG(disconnect_window->window)->vbox;
-+#endif
-
- disconnect_window->label = gtk_label_new(label_text);
-
-Index: gaim/src/gtkconv.c
-===================================================================
---- gaim.orig/src/gtkconv.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkconv.c 2005-08-19 23:27:18.000000000 +0200
-@@ -847,10 +847,12 @@
- GtkWidget *label;
- GtkWidget *vbox, *hbox;
- GtkWidget *table;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img;
-
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
-
- info = g_new0(InviteBuddyInfo, 1);
- info->conv = conv;
-@@ -880,6 +882,7 @@
- gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the inner hbox and put the dialog's icon in it. */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(vbox), hbox);
-@@ -889,6 +892,7 @@
- /* Setup the right vbox. */
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(hbox), vbox);
-+#endif
-
- /* Put our happy label in it. */
- label = gtk_label_new(_("Please enter the name of the user you wish "
-@@ -1107,8 +1111,10 @@
- GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win);
- GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
- GtkWidget *hbox;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
-+#endif
- GtkWidget *label;
- struct _search *s;
-
-@@ -1139,9 +1145,11 @@
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox),
- hbox);
-+#if ICONS_IN_DIALOGS
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-
- gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-+#endif
- gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkconv->dialogs.search),
- GTK_RESPONSE_OK, FALSE);
-
-Index: gaim/src/gtkdebug.c
-===================================================================
---- gaim.orig/src/gtkdebug.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkdebug.c 2005-08-19 23:27:18.000000000 +0200
-@@ -149,7 +149,10 @@
- static void
- find_cb(GtkWidget *w, DebugWindow *win)
- {
-- GtkWidget *hbox, *img, *label;
-+ GtkWidget *hbox, *label;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *img;
-+#endif
- struct _find *f;
-
- if(win->find)
-@@ -179,11 +182,13 @@
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox),
- hbox);
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
- GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-
- gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-+#endif
- gtk_dialog_set_response_sensitive(GTK_DIALOG(win->find),
- GTK_RESPONSE_OK, FALSE);
-
-Index: gaim/src/gtkdialogs.c
-===================================================================
---- gaim.orig/src/gtkdialogs.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkdialogs.c 2005-08-19 23:27:18.000000000 +0200
-@@ -534,7 +534,9 @@
- GtkWidget *window;
- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img;
-+#endif
- gchar *norm = gaim_strreplace(ee, "rocksmyworld", "");
-
- label = gtk_label_new(NULL);
-@@ -582,8 +584,10 @@
-
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox);
-+#if ICONS_IN_DIALOGS
- img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL));
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-+#endif
-
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-Index: gaim/src/gtkgaim.h
-===================================================================
---- gaim.orig/src/gtkgaim.h 2005-08-19 23:26:29.000000000 +0200
-+++ gaim/src/gtkgaim.h 2005-08-21 02:32:29.270335816 +0200
-@@ -61,5 +61,10 @@
- #define GAIM_HIG_BORDER 12
- #define GAIM_HIG_BOX_SPACE 6
-
-+/**
-+ * Do we want icons in dialogs?
-+ */
-+#define ICONS_IN_DIALOGS 1
-+
- #endif /* _GAIM_GTKGAIM_H_ */
-
-Index: gaim/src/gtknotify.c
-===================================================================
---- gaim.orig/src/gtknotify.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtknotify.c 2005-08-21 02:32:03.765213184 +0200
-@@ -125,7 +125,9 @@
- GtkWidget *dialog;
- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
- GtkWidget *img = NULL;
-+#endif
- char label_text[2048];
- const char *icon_name = NULL;
- char *primary_esc, *secondary_esc;
-@@ -149,11 +151,13 @@
- break;
- }
-
-+#if ICONS_IN_DIALOGS
- if (icon_name != NULL)
- {
- img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
- }
-+#endif
-
- dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE,
- NULL, 0, GTK_STOCK_CLOSE,
-@@ -173,8 +177,10 @@
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-
-+#if ICONS_IN_DIALOGS
- if (img != NULL)
- gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-+#endif
-
- primary_esc = g_markup_escape_text(primary, -1);
- secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
-@@ -218,9 +224,11 @@
- GaimNotifyMailData *data;
- GtkWidget *dialog;
- GtkWidget *vbox;
-- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- char *detail_text;
- char *label_text;
-
-@@ -248,6 +256,7 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-@@ -262,6 +271,9 @@
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = GTK_DIALOG(dialog)->vbox;
-+#endif
-
- /* Descriptive label */
- detail_text = g_strdup_printf(ngettext("%s has %d new message.",
-Index: gaim/src/gtkrequest.c
-===================================================================
---- gaim.orig/src/gtkrequest.c 2005-08-19 23:23:45.000000000 +0200
-+++ gaim/src/gtkrequest.c 2005-08-21 02:32:15.943361824 +0200
-@@ -281,10 +281,12 @@
- GaimGtkRequestData *data;
- GtkWidget *dialog;
- GtkWidget *vbox;
-- GtkWidget *hbox;
- GtkWidget *label;
- GtkWidget *entry;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- GtkWidget *toolbar;
- char *label_text;
- char *primary_esc, *secondary_esc;
-@@ -318,6 +320,7 @@
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-@@ -332,6 +335,9 @@
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = GTK_DIALOG(dialog)->vbox;
-+#endif
-
- /* Descriptive label */
- primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
-@@ -435,9 +441,11 @@
- GaimGtkRequestData *data;
- GtkWidget *dialog;
- GtkWidget *vbox, *vbox2;
-- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- GtkWidget *radio = NULL;
- char *label_text;
- char *radio_text;
-@@ -475,6 +483,7 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-@@ -488,6 +497,9 @@
- /* Vertical box */
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = GTK_DIALOG(dialog)->vbox;
-+#endif
-
- /* Descriptive label */
- primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
-@@ -536,9 +548,11 @@
- GaimGtkRequestData *data;
- GtkWidget *dialog;
- GtkWidget *vbox;
-- GtkWidget *hbox;
- GtkWidget *label;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- void **buttons;
- char *label_text;
- char *primary_esc, *secondary_esc;
-@@ -584,6 +598,7 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
-@@ -597,7 +612,10 @@
- /* Vertical box */
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
--
-+#else
-+ vbox = GTK_DIALOG(dialog)->vbox;
-+#endif
-+
- /* Descriptive label */
- primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
- secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
-@@ -620,10 +638,12 @@
-
-
- if (default_action == GAIM_DEFAULT_ACTION_NONE) {
-+#if ICONS_IN_DIALOGS
- GTK_WIDGET_SET_FLAGS(img, GTK_CAN_DEFAULT);
- GTK_WIDGET_SET_FLAGS(img, GTK_CAN_FOCUS);
- gtk_widget_grab_focus(img);
- gtk_widget_grab_default(img);
-+#endif
- } else
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_action);
-
-@@ -1351,13 +1371,15 @@
- GtkWidget *win;
- GtkWidget *vbox;
- GtkWidget *vbox2;
-- GtkWidget *hbox;
- GtkWidget *bbox;
- GtkWidget *frame;
- GtkWidget *label;
- GtkWidget *table;
- GtkWidget *button;
-+#if ICONS_IN_DIALOGS
-+ GtkWidget *hbox;
- GtkWidget *img;
-+#endif
- GtkWidget *sw;
- GtkSizeGroup *sg;
- GList *gl, *fl;
-@@ -1392,6 +1414,7 @@
- g_signal_connect(G_OBJECT(win), "delete_event",
- G_CALLBACK(destroy_multifield_cb), data);
-
-+#if ICONS_IN_DIALOGS
- /* Setup the main horizontal box */
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(win), hbox);
-@@ -1407,6 +1430,10 @@
- /* Setup the vbox */
- vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-+#else
-+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-+ gtk_container_add(GTK_CONTAINER(win), vbox);
-+#endif
- gtk_widget_show(vbox);
-
- sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
diff --git a/packages/gaim/files/02-request-field-dialogs.patch b/packages/gaim/files/02-request-field-dialogs.patch
deleted file mode 100644
index 50529ca53e..0000000000
--- a/packages/gaim/files/02-request-field-dialogs.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Identiske underkataloger: src2/CVS og src/CVS
-Identiske underkataloger: src2/.deps og src/.deps
-Index: gaim/src/gtkgaim.h
-===================================================================
---- gaim.orig/src/gtkgaim.h 2005-08-19 21:46:09.550560256 +0200
-+++ gaim/src/gtkgaim.h 2005-08-19 21:47:37.276223928 +0200
-@@ -66,5 +66,11 @@
- */
- #define ICONS_IN_DIALOGS 0
-
-+/**
-+ * How many fields is there screen-space for vertically, before a scrollbar is needed?
-+ */
-+#define VERT_ITEMS 0
-+
-+
- #endif /* _GAIM_GTKGAIM_H_ */
-
-Index: gaim/src/gtkrequest.c
-===================================================================
---- gaim.orig/src/gtkrequest.c 2005-08-19 21:46:09.550560256 +0200
-+++ gaim/src/gtkrequest.c 2005-08-19 21:53:46.782050504 +0200
-@@ -1381,6 +1381,8 @@
- GtkWidget *img;
- #endif
- GtkWidget *sw;
-+ GtkWidget *pri_label;
-+ GtkWidget *sec_label;
- GtkSizeGroup *sg;
- GList *gl, *fl;
- GaimRequestFieldGroup *group;
-@@ -1450,6 +1452,7 @@
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
- gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
- gtk_widget_show(label);
-+ pri_label = label;
- g_free(label_text);
- }
-
-@@ -1457,7 +1460,7 @@
- gl = gl->next)
- total_fields += g_list_length(gaim_request_field_group_get_fields(gl->data));
-
-- if(total_fields > 9) {
-+ if(total_fields > VERT_ITEMS) {
- sw = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-@@ -1484,6 +1487,7 @@
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
- gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0);
- gtk_widget_show(label);
-+ sec_label = label;
- }
-
- for (gl = gaim_request_fields_get_groups(fields);
-@@ -1718,6 +1722,59 @@
-
- gtk_widget_show(win);
-
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h, field_labels_w;
-+ GtkRequisition sg_labels_req;
-+ gtk_window_get_size(GTK_WINDOW(win), &w, &h);
-+ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label
-+
-+ printf("%d / %d\n", field_labels_w, w);
-+
-+ w = w - GAIM_HIG_BORDER * 2;
-+ if (primary) gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
-+ if (secondary) gtk_widget_set_size_request(GTK_WIDGET(sec_label), w, -1);
-+
-+ //Determine what to do - add a scrollbar or resize the input fields?
-+ if ((float)field_labels_w / w > 0.5) //if the labels fill more than half the screen add a horizontal scrollbar
-+ {
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ }
-+ else //resize the input fields
-+ {
-+ for (gl = gaim_request_fields_get_groups(fields);
-+ gl != NULL;
-+ gl = gl->next)
-+ {
-+ GList *field_list;
-+ size_t field_count = 0;
-+ size_t cols = 1;
-+ size_t rows;
-+ size_t col_num;
-+ size_t row_num = 0;
-+
-+ group = gl->data;
-+ field_list = gaim_request_field_group_get_fields(group);
-+
-+ for (row_num = 0, fl = field_list;
-+ row_num < rows && fl != NULL;
-+ row_num++)
-+ {
-+ for (col_num = 0;
-+ col_num < cols && fl != NULL;
-+ col_num++, fl = fl->next)
-+ {
-+ field = fl->data;
-+ gtk_widget_set_size_request(GTK_WIDGET(field->ui_data), w-field_labels_w, -1);
-+ }
-+ }
-+ }
-+ }
-+
- return data;
- }
-
diff --git a/packages/gaim/files/03-blist-dialogs.patch b/packages/gaim/files/03-blist-dialogs.patch
deleted file mode 100644
index 62d4710d46..0000000000
--- a/packages/gaim/files/03-blist-dialogs.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-Identiske underkataloger: src2/CVS og src/CVS
-Identiske underkataloger: src2/.deps og src/.deps
-Index: gaim/src/gtkblist.c
-===================================================================
---- gaim.orig/src/gtkblist.c 2005-08-19 21:57:30.272074856 +0200
-+++ gaim/src/gtkblist.c 2005-08-19 21:57:42.030287336 +0200
-@@ -825,6 +825,15 @@
- joinchat_set_sensitive_if_input_cb(NULL, data);
-
- gtk_widget_show_all(data->entries_box);
-+
-+ GList* children;
-+ children = GTK_BOX(data->entries_box)->children;
-+ while (children)
-+ {
-+ //Let the prilabel handle the maxsize
-+ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1);
-+ children = children->next;
-+ }
- }
-
- static void
-@@ -916,12 +925,26 @@
- #else
- vbox = GTK_DIALOG(data->window)->vbox;
- #endif
-+
-+ //Make a scrollview to accomodate it all
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, 200);
-+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-+ gtk_widget_show(sw);
-+
-+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
-
- label = gtk_label_new(_("Please enter the appropriate information "
- "about the chat you would like to join.\n"));
- 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);
-+ pri_label = label;
-
- rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0);
-@@ -955,6 +978,22 @@
- g_object_unref(data->sg);
-
- gtk_widget_show_all(data->window);
-+
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h;
-+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
-+
-+ // Window_border Scrollbar (FFH)
-+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
-+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
-+
-+ //Let the prilabel handle the maxsize
-+ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1);
- }
-
- static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) {
-@@ -4364,6 +4403,19 @@
- vbox = GTK_DIALOG(data->window)->vbox;
- #endif
-
-+ //Make a scrollview to accomodate it all
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, 200);
-+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-+ gtk_widget_show(sw);
-+
-+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
-+
- label = gtk_label_new(
- _("Please enter the screen name of the person you would like "
- "to add to your buddy list. You may optionally enter an alias, "
-@@ -4374,6 +4426,7 @@
- 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);
-+ pri_label = label;
-
- hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
- gtk_container_add(GTK_CONTAINER(vbox), hbox);
-@@ -4446,6 +4499,25 @@
-
- if (group != NULL)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry), group);
-+
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h, field_labels_w;
-+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
-+ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label
-+
-+ // Window_border Scrollbar (FFH)
-+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
-+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
-+ //Set the size of the input fields
-+ gtk_widget_set_size_request(GTK_WIDGET(data->entry), w-field_labels_w, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->entry_for_alias), w-field_labels_w, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->combo), w-field_labels_w, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->account_box), w-field_labels_w, -1);
-+
- }
-
- static void
-@@ -4572,6 +4644,9 @@
- GHashTable *defaults = NULL;
- struct proto_chat_entry *pce;
- gboolean focus = TRUE;
-+ GtkWidget *label;
-+ GtkWidget *rowbox;
-+ GtkWidget *input;
-
- g_return_if_fail(data->account != NULL);
-
-@@ -4596,10 +4671,6 @@
-
- for (tmp = list; tmp; tmp = tmp->next)
- {
-- GtkWidget *label;
-- GtkWidget *rowbox;
-- GtkWidget *input;
--
- pce = tmp->data;
-
- rowbox = gtk_hbox_new(FALSE, 5);
-@@ -4657,6 +4728,15 @@
- addchat_set_sensitive_if_input_cb(NULL, data);
-
- gtk_widget_show_all(data->entries_box);
-+
-+ GList* children;
-+ children = GTK_BOX(data->entries_box)->children;
-+ while (children)
-+ {
-+ //Let the prilabel handle the maxsize
-+ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1);
-+ children = children->next;
-+ }
- }
-
- static void
-@@ -4759,6 +4839,19 @@
- vbox = GTK_DIALOG(data->window)->vbox;
- #endif
-
-+ //Make a scrollview to accomodate it all
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, 200);
-+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-+ gtk_widget_show(sw);
-+
-+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
-+
- label = gtk_label_new(
- _("Please enter an alias, and the appropriate information "
- "about the chat you would like to add to your buddy list.\n"));
-@@ -4766,7 +4859,8 @@
- 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);
--
-+ pri_label = label;
-+
- rowbox = gtk_hbox_new(FALSE, 5);
- gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
-
-@@ -4825,6 +4919,24 @@
- G_CALLBACK(add_chat_resp_cb), data);
-
- gtk_widget_show_all(data->window);
-+
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust the label accordingly
-+ int w, h;
-+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h);
-+
-+ // Window_border Scrollbar (FFH)
-+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4;
-+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1);
-+ //Let the prilabel handle the maxsize
-+ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->alias_entry), 0, -1);
-+ gtk_widget_set_size_request(GTK_WIDGET(data->group_combo), 0, -1);
-+
- }
-
- static void
-Index: gaim/src/gtkrequest.c
-===================================================================
---- gaim.orig/src/gtkrequest.c 2005-08-19 21:57:30.273074704 +0200
-+++ gaim/src/gtkrequest.c 2005-08-19 21:58:05.468724152 +0200
-@@ -650,6 +650,17 @@
- /* Show everything. */
- gtk_widget_show_all(dialog);
-
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h;
-+ gtk_window_get_size(GTK_WINDOW(dialog), &w, &h);
-+
-+ w = w - GAIM_HIG_BORDER * 2;
-+ gtk_widget_set_size_request(GTK_WIDGET(label), w, -1);
-+
- return data;
- }
-
diff --git a/packages/gaim/files/04-saved-status-dialogs.patch b/packages/gaim/files/04-saved-status-dialogs.patch
deleted file mode 100644
index 2cdf70c5c1..0000000000
--- a/packages/gaim/files/04-saved-status-dialogs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Identiske underkataloger: src2/CVS og src/CVS
-Identiske underkataloger: src2/.deps og src/.deps
-Index: gaim/src/gtksavedstatuses.c
-===================================================================
---- gaim.orig/src/gtksavedstatuses.c 2005-08-13 07:54:33.000000000 +0200
-+++ gaim/src/gtksavedstatuses.c 2005-08-19 21:20:41.806812608 +0200
-@@ -417,6 +417,7 @@
- bbox = gtk_hbutton_box_new();
- gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-+ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
-
-@@ -449,12 +450,13 @@
- G_CALLBACK(status_window_delete_cb), dialog);
-
- /* Close button */
-- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ //We can do without the close button to save screen estate
-+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(status_window_close_cb), dialog);
-+ G_CALLBACK(status_window_close_cb), dialog);*/
-
- gtk_widget_show(win);
- }
-@@ -790,7 +792,8 @@
- disclosure = gaim_disclosure_new(_("Use a different status for some accounts"),
- _("Use a different status for some accounts"));
- gtk_box_pack_start(GTK_BOX(vbox), disclosure, FALSE, FALSE, 0);
-- gtk_widget_show(disclosure);
-+ //For now, do without the custom messages - not implemented yet
-+ //gtk_widget_show(disclosure);
-
- /* Setup the box that the disclosure will cover */
- dbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
diff --git a/packages/gaim/files/05-statusbox-icon-size.patch b/packages/gaim/files/05-statusbox-icon-size.patch
deleted file mode 100644
index e18f3b2bcb..0000000000
--- a/packages/gaim/files/05-statusbox-icon-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gaim.ori/src/gtkstatusbox.c 2005-09-04 20:42:29.000000000 +0200
-+++ gaim/src/gtkstatusbox.c 2005-09-05 08:44:13.000000000 +0200
-@@ -173,7 +173,7 @@
-
- text_rend = gtk_cell_renderer_text_new();
- icon_rend = gtk_cell_renderer_pixbuf_new();
-- icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS);
-+ icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR;
-
- status_box->imhtml_visible = FALSE;
- status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE,
diff --git a/packages/gaim/files/06-account-dialogs.patch b/packages/gaim/files/06-account-dialogs.patch
deleted file mode 100644
index 9d2cb9acb0..0000000000
--- a/packages/gaim/files/06-account-dialogs.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-Index: gaim/src/gtkaccount.c
-===================================================================
---- gaim.orig/src/gtkaccount.c 2005-08-25 17:16:44.000000000 +0200
-+++ gaim/src/gtkaccount.c 2005-08-29 22:34:25.511003600 +0200
-@@ -857,7 +857,6 @@
- {
- GtkWidget *frame;
- GtkWidget *vbox;
-- GtkWidget *vbox2;
- GtkWidget *hbox;
- GtkWidget *hbox2;
- GtkWidget *button;
-@@ -901,12 +900,8 @@
- gaim_set_accessible_label (dialog->icon_entry, label);
- dialog->icon_path = NULL;
-
-- vbox2 = gtk_vbox_new(FALSE, 0);
-- gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
-- gtk_widget_show(vbox2);
--
- hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
-- gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER);
-+ gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, GAIM_HIG_BORDER);
- gtk_widget_show(hbox2);
-
- button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-@@ -1275,7 +1270,18 @@
- gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->proxy_dropdown));
- #endif
-
-- add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown);
-+ GtkWidget *label;
-+ label = gtk_label_new_with_mnemonic(_("Proxy _type:"));
-+ gtk_size_group_add_widget(dialog->sg, label);
-+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-+ gtk_widget_show(label);
-+
-+ gtk_box_pack_start(GTK_BOX(vbox), dialog->proxy_dropdown, TRUE, TRUE, GAIM_HIG_BORDER);
-+ gtk_widget_show(dialog->proxy_dropdown);
-+ gaim_set_accessible_label (dialog->proxy_dropdown, label);
-+
-+ //add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown);
-
- /* Setup the second vbox, which may be hidden at times. */
- dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
-@@ -1643,6 +1649,7 @@
- AccountPrefsDialog *dialog;
- GtkWidget *win;
- GtkWidget *main_vbox;
-+ GtkWidget *sw;
- GtkWidget *vbox;
- GtkWidget *bbox;
- GtkWidget *dbox;
-@@ -1709,10 +1716,19 @@
- gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0);
-
- /* Setup the inner vbox */
-+ //With a scrollbox
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, -1);
-+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw,
-+ gtk_label_new_with_mnemonic("_Basic"));
-+ gtk_widget_show(sw);
- dialog->top_vbox = vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BORDER);
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
-- gtk_label_new_with_mnemonic("_Basic"));
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox);
- gtk_widget_show(vbox);
-
- /* Setup the top frames. */
-@@ -1720,10 +1736,20 @@
- add_user_options(dialog, vbox);
-
- /* Setup the page with 'Advanced'. */
-+ //With a scrollbox
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ gtk_widget_set_size_request(sw, -1, -1);
-+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw,
-+ gtk_label_new_with_mnemonic("_Advanced"));
-+ gtk_widget_show(sw);
- dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(dbox), GAIM_HIG_BORDER);
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox,
-- gtk_label_new_with_mnemonic("_Advanced"));
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), dbox);
-+ gtk_widget_show(dbox);
-
- /** Setup the bottom frames. */
- add_protocol_options(dialog, dbox);
-@@ -1731,46 +1757,50 @@
- add_proxy_options(dialog, dbox);
-
- /* Setup the button box */
-- bbox = gtk_hbutton_box_new();
-+ //bbox = gtk_hbutton_box_new();
-+ //Replaced with a hbox, otherwise the Register-button doesn't fit (same size required)
-+ bbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
-- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
-
-- /* Register button */
-- button = gtk_button_new_with_label(_("Register"));
-- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-- gtk_widget_show(button);
--
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(register_account_prefs_cb), dialog);
--
-- dialog->register_button = button;
--
-+ /* Save button */
-+ button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-+
- if (dialog->account == NULL)
- gtk_widget_set_sensitive(button, FALSE);
-
-- if (!dialog->prpl_info || !dialog->prpl_info->register_user)
-- gtk_widget_hide(button);
-+ gtk_widget_show(button);
-+
-+ dialog->ok_button = button;
-+
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(ok_account_prefs_cb), dialog);
-
- /* Cancel button */
- button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
-
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(cancel_account_prefs_cb), dialog);
-
-- /* Save button */
-- button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-+ /* Register button */
-+ button = gtk_button_new_with_label(_("Register"));
-+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-+ gtk_widget_show(button);
-+
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(register_account_prefs_cb), dialog);
-+
-+ dialog->register_button = button;
-
- if (dialog->account == NULL)
- gtk_widget_set_sensitive(button, FALSE);
-
-- gtk_widget_show(button);
--
-- dialog->ok_button = button;
-+ if (!dialog->prpl_info || !dialog->prpl_info->register_user)
-+ gtk_widget_hide(button);
-
- /* Set up DND */
- gtk_drag_dest_set(dialog->window,
-@@ -1783,11 +1813,20 @@
- g_signal_connect(G_OBJECT(dialog->window), "drag_data_received",
- G_CALLBACK(account_dnd_recv), dialog);
-
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(ok_account_prefs_cb), dialog);
--
- /* Show the window. */
- gtk_widget_show(win);
-+
-+ //Wait for the window to have recieved its "configure_event",
-+ //which means it has been resized by the WM
-+ while (gtk_events_pending ()) gtk_main_iteration ();
-+
-+ //Get allocated size, and adjust widgets accordingly
-+ int w, h;
-+ gtk_window_get_size(GTK_WINDOW(win), &w, &h);
-+
-+ w = w - GAIM_HIG_BORDER * 2;
-+ gtk_widget_set_size_request(GTK_WIDGET(dialog->protocol_menu), w, -1);
-+
- }
-
- /**************************************************************************
-@@ -2389,6 +2428,7 @@
- bbox = gtk_hbutton_box_new();
- gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-+ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
-
-@@ -2421,12 +2461,13 @@
- G_CALLBACK(ask_delete_account_cb), dialog);
-
- /* Close button */
-- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ //We can do without the close button to save screen estate
-+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_accounts_cb), dialog);
-+ G_CALLBACK(close_accounts_cb), dialog);*/
-
- /* Setup some gaim signal handlers. */
- gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
diff --git a/packages/gaim/files/07-roomlist-dialog.patch b/packages/gaim/files/07-roomlist-dialog.patch
deleted file mode 100644
index 2806c78fd4..0000000000
--- a/packages/gaim/files/07-roomlist-dialog.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: gaim/src/gtkroomlist.c
-===================================================================
---- gaim.orig/src/gtkroomlist.c 2005-08-13 01:53:28.000000000 +0200
-+++ gaim/src/gtkroomlist.c 2005-08-19 21:37:26.225117816 +0200
-@@ -129,7 +129,9 @@
- gtk_container_add(GTK_CONTAINER(dialog->sw), rl->tree);
-
- gtk_widget_set_sensitive(dialog->stop_button, TRUE);
-+ gtk_widget_show(dialog->stop_button);
- gtk_widget_set_sensitive(dialog->list_button, FALSE);
-+ gtk_widget_hide(dialog->list_button);
- gtk_widget_set_sensitive(dialog->join_button, FALSE);
- }
-
-@@ -141,7 +143,9 @@
- gtk_widget_set_sensitive(dialog->account_widget, TRUE);
-
- gtk_widget_set_sensitive(dialog->stop_button, FALSE);
-+ gtk_widget_hide(dialog->stop_button);
- gtk_widget_set_sensitive(dialog->list_button, TRUE);
-+ gtk_widget_show(dialog->list_button);
- gtk_widget_set_sensitive(dialog->join_button, FALSE);
- }
-
-@@ -396,7 +400,7 @@
- g_signal_connect(G_OBJECT(dialog->stop_button), "clicked",
- G_CALLBACK(stop_button_cb), dialog);
- gtk_widget_set_sensitive(dialog->stop_button, FALSE);
-- gtk_widget_show(dialog->stop_button);
-+ //gtk_widget_show(dialog->stop_button);
-
- /* list button */
- dialog->list_button = gtk_button_new_with_mnemonic(_("_Get List"));
-@@ -415,11 +419,12 @@
- gtk_widget_show(dialog->join_button);
-
- /* close button */
-- dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ //We can do without the close button to save screen estate
-+ /*dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(bbox), dialog->close_button, FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(dialog->close_button), "clicked",
- G_CALLBACK(close_button_cb), dialog);
-- gtk_widget_show(dialog->close_button);
-+ gtk_widget_show(dialog->close_button);*/
-
- /* show the dialog window and return the dialog */
- gtk_widget_show(dialog->window);
-@@ -683,14 +688,18 @@
- if (rl->dialog->account_widget)
- gtk_widget_set_sensitive(rl->dialog->account_widget, FALSE);
- gtk_widget_set_sensitive(rl->dialog->stop_button, TRUE);
-+ gtk_widget_show(rl->dialog->stop_button);
- gtk_widget_set_sensitive(rl->dialog->list_button, FALSE);
-+ gtk_widget_hide(rl->dialog->list_button);
- } else {
- rl->dialog->pg_needs_pulse = FALSE;
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(rl->dialog->progress), 0.0);
- if (rl->dialog->account_widget)
- gtk_widget_set_sensitive(rl->dialog->account_widget, TRUE);
- gtk_widget_set_sensitive(rl->dialog->stop_button, FALSE);
-+ gtk_widget_hide(rl->dialog->stop_button);
- gtk_widget_set_sensitive(rl->dialog->list_button, TRUE);
-+ gtk_widget_show(rl->dialog->list_button);
- }
- }
-
diff --git a/packages/gaim/files/08-prefs-dialog.patch b/packages/gaim/files/08-prefs-dialog.patch
deleted file mode 100644
index a8fcb89311..0000000000
--- a/packages/gaim/files/08-prefs-dialog.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- gaim.ori/src/gtkprefs.c 2005-09-05 08:28:17.000000000 +0200
-+++ gaim/src/gtkprefs.c 2005-09-05 09:06:27.000000000 +0200
-@@ -2108,12 +2108,18 @@
- if (icon)
- g_object_unref(icon);
-
--#if GTK_CHECK_VERSION(2,4,0)
-- return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
--#else
-- gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
-- return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page);
--#endif
-+ //Add a scrolled window around the page contents
-+ GtkWidget *sw;
-+ sw = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-+ GTK_SHADOW_NONE);
-+ //gtk_widget_set_size_request(sw, -1, 200);
-+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), page);
-+
-+
-+ return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), sw, gtk_label_new(text));
- }
-
- static void prefs_notebook_init() {
-@@ -2146,9 +2152,9 @@
- void gaim_gtk_prefs_show(void)
- {
- GtkWidget *vbox;
-- GtkWidget *bbox;
-+ //GtkWidget *bbox;
- GtkWidget *notebook;
-- GtkWidget *button;
-+ //GtkWidget *button;
-
- if (prefs) {
- gtk_window_present(GTK_WINDOW(prefs));
-@@ -2176,11 +2182,13 @@
-
- /* The notebook */
- prefsnotebook = notebook = gtk_notebook_new ();
-- gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
-+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(prefsnotebook), TRUE);
-+ gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
-
-
- /* The buttons to press! */
-- bbox = gtk_hbutton_box_new();
-+ //To save screen estate we will do without a close button
-+ /*bbox = gtk_hbutton_box_new();
- gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-@@ -2190,7 +2198,7 @@
- g_signal_connect_swapped(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy), prefs);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-- gtk_widget_show(button);
-+ gtk_widget_show(button);*/
-
- prefs_notebook_init();
-
diff --git a/packages/gaim/files/09-filetransfer-dialog.patch b/packages/gaim/files/09-filetransfer-dialog.patch
deleted file mode 100644
index c4fa3a0a6d..0000000000
--- a/packages/gaim/files/09-filetransfer-dialog.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: gaim/src/gtkft.c
-===================================================================
---- gaim.orig/src/gtkft.c 2005-08-21 01:59:50.000000000 +0200
-+++ gaim/src/gtkft.c 2005-08-29 23:05:02.000000000 +0200
-@@ -772,24 +772,26 @@
- G_CALLBACK(open_button_cb), dialog);
-
- /* Pause button */
-- button = gtk_button_new_with_mnemonic(_("_Pause"));
-+ /* Pause button has no function*/
-+ /*button = gtk_button_new_with_mnemonic(_("_Pause"));
- gtk_widget_set_sensitive(button, FALSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
- dialog->pause_button = button;
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(pause_button_cb), dialog);
-+ G_CALLBACK(pause_button_cb), dialog);*/
-
- /* Resume button */
-- button = gtk_button_new_with_mnemonic(_("_Resume"));
-+ /* Resume button has no function */
-+ /*button = gtk_button_new_with_mnemonic(_("_Resume"));
- gtk_widget_set_sensitive(button, FALSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
- dialog->resume_button = button;
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(resume_button_cb), dialog);
-+ G_CALLBACK(resume_button_cb), dialog);*/
-
- /* Remove button */
- button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
-@@ -811,13 +813,14 @@
- G_CALLBACK(stop_button_cb), dialog);
-
- /* Close button */
-- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ /* Do without a close button to save screen estate */
-+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_widget_show(button);
- dialog->close_button = button;
-
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_button_cb), dialog);
-+ G_CALLBACK(close_button_cb), dialog);*/
-
- return dialog;
- }
diff --git a/packages/gaim/files/10-pda-default-settings.patch b/packages/gaim/files/10-pda-default-settings.patch
deleted file mode 100644
index 953dc11612..0000000000
--- a/packages/gaim/files/10-pda-default-settings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gaim/src/gtkconv.c
-===================================================================
---- gaim.orig/src/gtkconv.c 2005-08-25 17:16:50.000000000 +0200
-+++ gaim/src/gtkconv.c 2005-08-29 23:56:48.142463528 +0200
-@@ -6126,7 +6126,7 @@
- gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE);
- gaim_prefs_add_bool("/gaim/gtk/conversations/show_incoming_formatting", TRUE);
-
-- gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);
-+ gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", FALSE);
- gaim_prefs_add_bool("/gaim/gtk/conversations/passthrough_unknown_commands", FALSE);
-
- gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last");
diff --git a/packages/gaim/files/define-pda-mode.patch b/packages/gaim/files/define-pda-mode.patch
deleted file mode 100644
index f1a368bc73..0000000000
--- a/packages/gaim/files/define-pda-mode.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: gaim/src/gtkgaim.h
-===================================================================
---- gaim.orig/src/gtkgaim.h 2005-08-25 17:29:42.000000000 +0200
-+++ gaim/src/gtkgaim.h 2005-08-25 19:00:37.335318168 +0200
-@@ -57,14 +57,14 @@
- * Spacings between components, as defined by the
- * Gnome Human Interface Guidelines.
- */
--#define GAIM_HIG_CAT_SPACE 18
--#define GAIM_HIG_BORDER 12
--#define GAIM_HIG_BOX_SPACE 6
-+#define GAIM_HIG_CAT_SPACE 9
-+#define GAIM_HIG_BORDER 6
-+#define GAIM_HIG_BOX_SPACE 3
-
- /**
- * Do we want icons in dialogs?
- */
--#define ICONS_IN_DIALOGS 1
-+#define ICONS_IN_DIALOGS 0
-
- /**
- * How many fields is there screen-space for vertically, before a scrollbar is needed?
-Index: gaim/src/gtkutils.c
-===================================================================
---- gaim.orig/src/gtkutils.c 2005-08-25 19:01:19.630888264 +0200
-+++ gaim/src/gtkutils.c 2005-08-25 19:02:05.067980776 +0200
-@@ -398,7 +398,7 @@
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- gtk_widget_show(hbox);
-
-- label = gtk_label_new(" ");
-+ label = gtk_label_new(" ");
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_widget_show(label);
-
diff --git a/packages/gaim/files/desktop-name-2.0.0.patch b/packages/gaim/files/desktop-name-2.0.0.patch
deleted file mode 100644
index c921619721..0000000000
--- a/packages/gaim/files/desktop-name-2.0.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: gaim/gaim.desktop
-===================================================================
---- gaim.orig/gaim.desktop 2005-06-06 03:40:46.000000000 +0200
-+++ gaim/gaim.desktop 2005-08-21 02:00:18.525853592 +0200
-@@ -33,21 +33,7 @@
- GenericName[sq]=Lajmësjellës Internet
- GenericName[sv]=Meddelandeklient
- GenericName[zh_CN]=互联网通讯程序
--Name=Gaim Internet Messenger
--Name[da]=Gaim - internet beskeder
--Name[de]=Gaim Internet Messenger
--Name[fr]=Gaim Messagerie Instantanée
--Name[hu]=Gaim IM
--Name[it]=Gaim Internet Messenger
--Name[ko]=게임 메신저
--Name[nb]=Gaim lynmeldingsklient
--Name[nl]=Gaim - Expresberichten
--Name[pl]=Komunikator Internetowy Gaim
--Name[pt]=Mensageiro Internet Gaim
--Name[sl]=Gaim - spletni sel
--Name[sq]=Lajmësjellësi Internet Gaim
--Name[sv]=Gaim Internet Messenger
--Name[zh_CN]=Gaim 互联网通讯程序
-+Name=Gaim
- Exec=gaim
- Icon=gaim.png
- StartupNotify=true
diff --git a/packages/gaim/files/desktop-name.patch b/packages/gaim/files/desktop-name.patch
deleted file mode 100644
index 6095a77e47..0000000000
--- a/packages/gaim/files/desktop-name.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gaim-1.0.3/gaim.desktop.old 2005-01-01 16:48:58.000000000 +0000
-+++ gaim-1.0.3/gaim.desktop 2005-01-01 16:49:15.000000000 +0000
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--Name=Gaim Internet Messenger
-+Name=Gaim
- Name[de]=Gaim Internet Messenger
- Name[da]=Gaim - internet beskeder
- Name[fr]=Gaim Messagerie Instantanée
diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/gaim/files/desktop-name_1.4.0.patch
deleted file mode 100644
index 3cfaa5771e..0000000000
--- a/packages/gaim/files/desktop-name_1.4.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200
-+++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
-
--Name=Gaim Internet Messenger
-+Name=Gaim
- Name[ca]=Missatger d'Internet Gaim
- Name[cs]=Gaim Internet Messenger
- Name[da]=Gaim - internet beskeder
diff --git a/packages/gaim/files/desktop-name_1.5.0.patch b/packages/gaim/files/desktop-name_1.5.0.patch
deleted file mode 100644
index 3cfaa5771e..0000000000
--- a/packages/gaim/files/desktop-name_1.5.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200
-+++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
-
--Name=Gaim Internet Messenger
-+Name=Gaim
- Name[ca]=Missatger d'Internet Gaim
- Name[cs]=Gaim Internet Messenger
- Name[da]=Gaim - internet beskeder
diff --git a/packages/gaim/files/docklet-icon-size.patch b/packages/gaim/files/docklet-icon-size.patch
deleted file mode 100644
index 6b8047a30c..0000000000
--- a/packages/gaim/files/docklet-icon-size.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gaim/plugins/docklet/docklet-x11.c
-===================================================================
---- gaim.orig/plugins/docklet/docklet-x11.c 2005-04-02 17:23:28.000000000 +0200
-+++ gaim/plugins/docklet/docklet-x11.c 2005-08-21 02:06:51.869056336 +0200
-@@ -112,7 +112,7 @@
- break;
- }
-
-- gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-+ gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR);
-
- #if 0
- GdkPixbuf *p;
diff --git a/packages/gaim/files/gaim-OE-branding.patch b/packages/gaim/files/gaim-OE-branding.patch
deleted file mode 100644
index d090899cac..0000000000
--- a/packages/gaim/files/gaim-OE-branding.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/irc.h 2005-10-04 14:10:59.699874560 +0200
-+++ gaim/src/protocols/irc/irc.h 2005-10-04 14:13:10.135045400 +0200
-@@ -35,7 +35,7 @@
- #define IRC_DEFAULT_CHARSET "UTF-8"
- #define IRC_DEFAULT_ALIAS "gaim"
-
--#define IRC_DEFAULT_QUIT "Download Gaim: " GAIM_WEBSITE
-+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
-
- #define IRC_INITIAL_BUFSIZE 1024
-
diff --git a/packages/gaim/files/gevolution-eds-dbus.patch b/packages/gaim/files/gevolution-eds-dbus.patch
deleted file mode 100644
index 0b7479d4f7..0000000000
--- a/packages/gaim/files/gevolution-eds-dbus.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- gaim/plugins/gevolution/gevolution.c.orig 2006-02-23 23:30:25.000000000 +0100
-+++ gaim/plugins/gevolution/gevolution.c 2006-02-23 23:31:42.000000000 +0100
-@@ -38,17 +38,12 @@
-
--#include <libedata-book/Evolution-DataServer-Addressbook.h>
-
--#include <libebook/e-book-listener.h>
--#include <libedata-book/e-data-book-factory.h>
--#include <bonobo/bonobo-main.h>
-+#include <libebook/e-book-view-listener.h>
-+#include <libebook/e-data-book-factory-bindings.h>
-
- #include <glib.h>
-
- #define GEVOLUTION_PLUGIN_ID "gtk-x11-gevolution"
-
--#define E_DATA_BOOK_FACTORY_OAF_ID \
-- "OAFIID:GNOME_Evolution_DataServer_BookFactory"
--
- enum
- {
- COLUMN_AUTOADD,
-@@ -324,8 +320,6 @@
- static gboolean
- plugin_load(GaimPlugin *plugin)
- {
-- bonobo_activate();
--
- backup_blist_ui_ops = gaim_blist_get_ui_ops();
-
- blist_ui_ops = g_memdup(backup_blist_ui_ops, sizeof(GaimBlistUiOps));
-@@ -370,7 +364,6 @@
- static void
- plugin_destroy(GaimPlugin *plugin)
- {
-- bonobo_debug_shutdown();
- }
-
- static void
-@@ -563,13 +556,6 @@
- * So, in conclusion, this is an evil hack, but it doesn't harm anything
- * and it works.
- */
-- g_module_make_resident(plugin->handle);
--
-- if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
-- CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
-- {
-- gaim_debug_error("evolution", "Unable to initialize bonobo.\n");
-- }
- }
-
- GAIM_INIT_PLUGIN(gevolution, init_plugin, info)
diff --git a/packages/gaim/files/gtk-deprecated-2.0.0.patch b/packages/gaim/files/gtk-deprecated-2.0.0.patch
deleted file mode 100644
index 04bb9244f0..0000000000
--- a/packages/gaim/files/gtk-deprecated-2.0.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gaim/configure.ac.orig 2005-12-19 23:04:14 +0100
-+++ gaim/configure.ac 2005-12-19 23:04:49 +0100
-@@ -442,10 +442,6 @@
- fi
- fi
-
--if test "x$enable_deprecated" = "xno"; then
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
--fi
--
- if test "x$GCC" = "xyes"; then
- DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
- CFLAGS="-g $CFLAGS"
diff --git a/packages/gaim/files/no-superimposed-version-on-logo.patch b/packages/gaim/files/no-superimposed-version-on-logo.patch
deleted file mode 100644
index 86809dfe98..0000000000
--- a/packages/gaim/files/no-superimposed-version-on-logo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: gaim/src/gtkstock.c
-===================================================================
---- gaim.orig/src/gtkstock.c 2005-08-15 08:52:45.000000000 +0200
-+++ gaim/src/gtkstock.c 2005-08-19 18:13:26.550881552 +0200
-@@ -214,12 +214,12 @@
-
- pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-
- g_free(filename);
-
-- if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO))
-- gaim_gtk_stock_versionize(&pixbuf, win);
-+ /*if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO))
-+ gaim_gtk_stock_versionize(&pixbuf, win);*/
-
- iconset = gtk_icon_set_new_from_pixbuf(pixbuf);
-
- g_object_unref(G_OBJECT(pixbuf));
- }
diff --git a/packages/gaim/files/purple-OE-branding.patch b/packages/gaim/files/purple-OE-branding.patch
deleted file mode 100644
index 99c61375ce..0000000000
--- a/packages/gaim/files/purple-OE-branding.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- /tmp/irc.h 2007-08-04 20:27:10.000000000 +0200
-+++ pidgin-2.1.0/libpurple/protocols/irc/irc.h 2007-08-04 20:28:15.318400000 +0200
-@@ -35,9 +35,9 @@
- #define IRC_DEFAULT_SSL_PORT 994
-
- #define IRC_DEFAULT_CHARSET "UTF-8"
--#define IRC_DEFAULT_ALIAS "purple"
-+#define IRC_DEFAULT_ALIAS "OE-user"
-
--#define IRC_DEFAULT_QUIT "Leaving."
-+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
-
- #define IRC_INITIAL_BUFSIZE 1024
-
diff --git a/packages/gaim/files/series b/packages/gaim/files/series
deleted file mode 100644
index c7a16f71c1..0000000000
--- a/packages/gaim/files/series
+++ /dev/null
@@ -1,14 +0,0 @@
-no-superimposed-version-on-logo.patch
-01-optional-icons-in-dialogs.patch
-02-request-field-dialogs.patch
-03-blist-dialogs.patch
-04-saved-status-dialogs.patch
-05-statusbox-icon-size.patch
-06-account-dialogs.patch
-07-roomlist-dialog.patch
-define-pda-mode.patch
-desktop-name-2.0.0.patch
-docklet-icon-size.patch
-08-prefs-dialog.patch
-09-filetransfer-dialog.patch
-10-pda-default-settings.patch
diff --git a/packages/gaim/gaim.inc b/packages/gaim/gaim.inc
deleted file mode 100644
index d2fb38881a..0000000000
--- a/packages/gaim/gaim.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "multi-protocol instant messaging client"
-LICENSE = "GPL"
-
-DEPENDS = "gtk+ gnutls virtual/libintl"
-RRECOMMENDS_${PN} = "gaim-protocol-irc gaim-protocol-jabber gaim-plugin-docklet"
-
-EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated"
-
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
- ${sysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \
- ${datadir}/pixmaps ${datadir}/applications \
- ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
- ${libdir}/bonobo/servers"
-FILES_${PN}-dev += "${libdir}/gaim/*.la"
-
-inherit autotools gettext
-
-PACKAGES_DYNAMIC = "gaim-protocol-* gaim-plugin-*"
-
-python populate_packages_prepend () {
- root = bb.data.expand('${libdir}/gaim', d)
-
- do_split_packages(d, root, '^([^l][^i][^b].*)\.so$',
- output_pattern='gaim-plugin-%s',
- description='GAIM plugin %s',
- prepend=True)
-
- do_split_packages(d, root, '^lib(.*)\.so$',
- output_pattern='gaim-protocol-%s',
- description='GAIM protocol plugin for %s',
- prepend=True,
- aux_files_pattern=['${datadir}/pixmaps/gaim/status/default/%s.png', '${datadir}/pixmaps/gaim/smileys/default/%s_*'])
-}
diff --git a/packages/gaim/gaim_1.0.3.bb b/packages/gaim/gaim_1.0.3.bb
deleted file mode 100644
index f833ddde28..0000000000
--- a/packages/gaim/gaim_1.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
diff --git a/packages/gaim/gaim_1.1.0.bb b/packages/gaim/gaim_1.1.0.bb
deleted file mode 100644
index f833ddde28..0000000000
--- a/packages/gaim/gaim_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
diff --git a/packages/gaim/gaim_1.1.1.bb b/packages/gaim/gaim_1.1.1.bb
deleted file mode 100644
index f833ddde28..0000000000
--- a/packages/gaim/gaim_1.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
diff --git a/packages/gaim/gaim_1.1.2.bb b/packages/gaim/gaim_1.1.2.bb
deleted file mode 100644
index 3bf9aeb3a7..0000000000
--- a/packages/gaim/gaim_1.1.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
-
-CFLAGS += "-D_GNU_SOURCE"
-
diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb
deleted file mode 100644
index 1585229b14..0000000000
--- a/packages/gaim/gaim_1.4.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name_1.4.0.patch;patch=1"
-
-require gaim.inc
-
-CFLAGS += "-D_GNU_SOURCE"
-
diff --git a/packages/gaim/gaim_1.5.0.bb b/packages/gaim/gaim_1.5.0.bb
deleted file mode 100644
index 3bf9aeb3a7..0000000000
--- a/packages/gaim/gaim_1.5.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
- file://desktop-name.patch;patch=1"
-
-require gaim.inc
-
-CFLAGS += "-D_GNU_SOURCE"
-
diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb
deleted file mode 100644
index bf8591920c..0000000000
--- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-PR = "r3"
-SRCDATE_${PN} = "20050904"
-#Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes
-PV = "2.0.0-cvs-mco1-${SRCDATE}"
-
-DEFAULT_PREFERENCE = "-1"
-
-WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim"
-
-SRC_URI = "cvs://anonymous@gaim.cvs.sourceforge.net/cvsroot/gaim;module=gaim \
- ${WEBCVSURL}/no-superimposed-version-on-logo.patch;patch=1 \
- ${WEBCVSURL}/01-optional-icons-in-dialogs.patch;patch=1 \
- ${WEBCVSURL}/02-request-field-dialogs.patch;patch=1 \
- ${WEBCVSURL}/03-blist-dialogs.patch;patch=1 \
- ${WEBCVSURL}/04-saved-status-dialogs.patch;patch=1 \
- ${WEBCVSURL}/05-statusbox-icon-size.patch;patch=1 \
- ${WEBCVSURL}/06-account-dialogs.patch;patch=1 \
- ${WEBCVSURL}/07-roomlist-dialog.patch;patch=1 \
- ${WEBCVSURL}/define-pda-mode.patch;patch=1 \
- ${WEBCVSURL}/desktop-name-2.0.0.patch;patch=1 \
- ${WEBCVSURL}/docklet-icon-size.patch;patch=1 \
- ${WEBCVSURL}/08-prefs-dialog.patch;patch=1 \
- ${WEBCVSURL}/09-filetransfer-dialog.patch;patch=1 \
- ${WEBCVSURL}/10-pda-default-settings.patch;patch=1 \
- file://gaim-OE-branding.patch;patch=1 \
- "
-
-require gaim.inc
-
-S = "${WORKDIR}/gaim"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-
-DEPENDS += "startup-notification"
-
-#include autopoint (gettext)
-EXTRA_AUTORECONF = ""
-
-#disable "X Session Management"... It is EVIL
-EXTRA_OECONF += "--disable-sm --enable-startup-notification \
- --with-gnutls-includes=${STAGING_INCDIR}"
-
-
diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc
deleted file mode 100644
index a2ef61a508..0000000000
--- a/packages/gaim/pidgin.inc
+++ /dev/null
@@ -1,85 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "multi-protocol instant messaging client"
-LICENSE = "GPL"
-
-DEPENDS = "avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
-RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
-
-EXTRA_OECONF = " \
- --disable-audio \
- --disable-perl \
- --disable-tcl \
- --disable-deprecated \
- --disable-gevolution \
- --x-includes=${STAGING_INCDIR} \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-gnutls=yes \
- --with-ncurses-headers=${STAGING_INCDIR} \
- --with-gnutls-includes=${STAGING_INCDIR} \
- --with-gnutls-libs=${STAGING_LIBDIR} \
- "
-
-OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
-OE_LT_RPATH_ALLOW[export]="1"
-
-PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg"
-
-
-LEAD_SONAME = "libpurple.so.0"
-FILES_libpurple = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*"
-FILES_libpurple-dev = "${libdir}/libpurple* \
- ${libdir}/purple-2/*.la "
-FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \
- ${libdir}/purple-2/.debug"
-FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*"
-FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*"
-FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so"
-FILES_finch = "${bindir}/finch /usr/lib/libgnt.so.*"
-FILES_finch-dev = "${libdir}/finch/*.la"
-FILES_finch-dbg = "${bindir}/.debug/finch \
- ${libdir}/finch/.debug"
-
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
- ${sysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \
- ${datadir}/pixmaps ${datadir}/applications \
- ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
- ${libdir}/bonobo/servers ${datadir}/icons"
-FILES_${PN}-dev += "${libdir}/pidgin/*.la"
-
-inherit autotools gettext pkgconfig gconf
-
-PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*"
-
-python populate_packages_prepend () {
- root = bb.data.expand('${libdir}/pidgin', d)
- purple = bb.data.expand('${libdir}/purple-2', d)
- finch = bb.data.expand('${libdir}/finch', d)
-
- do_split_packages(d, root, '^([^l][^i][^b].*)\.so$',
- output_pattern='pidgin-plugin-%s',
- description='Pidgin plugin %s',
- prepend=True, extra_depends='')
-
- do_split_packages(d, purple, '^lib(.*)\.so$',
- output_pattern='libpurple-protocol-%s',
- description='Libpurple protocol plugin for %s',
- prepend=True, extra_depends='')
-
- do_split_packages(d, purple, '^(ssl-.*)\.so$',
- output_pattern='libpurple-plugin-%s',
- description='libpurple plugin %s',
- prepend=True, extra_depends='libpurple-plugin-ssl')
-
- do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
- output_pattern='libpurple-plugin-%s',
- description='libpurple plugin %s',
- prepend=True, extra_depends='')
-
- do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$',
- output_pattern='finch-plugin-%s',
- description='Finch plugin %s',
- prepend=True, extra_depends='')
-
-
-}
diff --git a/packages/gaim/pidgin/.mtn2git_empty b/packages/gaim/pidgin/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gaim/pidgin/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gaim/pidgin/gconf-no-errors.patch b/packages/gaim/pidgin/gconf-no-errors.patch
deleted file mode 100644
index 9a95175ac9..0000000000
--- a/packages/gaim/pidgin/gconf-no-errors.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/Makefile.am 2007-05-08 18:39:49.000000000 +0200
-+++ pidgin-2.0.0/libpurple/gconf/Makefile.am 2007-05-08 18:40:13.755251000 +0200
-@@ -8,8 +8,7 @@
-
- if GCONF_SCHEMAS_INSTALL
- install-data-local:
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
-- grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1
- else
- install-data-local:
- endif
diff --git a/packages/gaim/pidgin/pidgin.desktop-set-icon.patch b/packages/gaim/pidgin/pidgin.desktop-set-icon.patch
deleted file mode 100644
index 05f76895ba..0000000000
--- a/packages/gaim/pidgin/pidgin.desktop-set-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pidgin-2.0.1/pidgin.desktop.in.orig 2007-06-20 23:50:44.000000000 +0000
-+++ pidgin-2.0.1/pidgin.desktop.in 2007-06-20 23:51:05.000000000 +0000
-@@ -4,7 +4,7 @@
- _GenericName=Internet Messenger
- _Comment=Send instant messages over multiple protocols
- Exec=pidgin
--Icon=pidgin
-+Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png
- StartupNotify=true
- Terminal=false
- Type=Application
diff --git a/packages/gaim/pidgin/sanitize-configure.ac.patch b/packages/gaim/pidgin/sanitize-configure.ac.patch
deleted file mode 100644
index a77d64f40b..0000000000
--- a/packages/gaim/pidgin/sanitize-configure.ac.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200
-+++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200
-@@ -472,7 +472,7 @@
- if test "x$enable_consoleui" = "xyes"; then
- dnl # Some distros put the headers in ncursesw/, some don't
- found_ncurses_h=no
-- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
-+ for location in $ac_ncurses_includes $NCURSES_HEADERS
- do
- f="$location/ncurses.h"
- AC_CHECK_HEADER($f,[
-@@ -1860,10 +1860,6 @@
- KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV"
- fi
- KRB4_LDFLAGS="-L${kerberos}/lib"
-- elif test -d /usr/local/include/kerberosIV ; then
-- KRB4_CFLAGS="-I/usr/local/include/kerberosIV"
-- elif test -d /usr/include/kerberosIV ; then
-- KRB4_CFLAGS="-I/usr/include/kerberosIV"
- fi
- AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.])
-
-@@ -1896,10 +1892,6 @@
- ZEPHYR_LDFLAGS="-L${zephyr}/lib"
- elif test -d /usr/athena/include/zephyr ; then
- ZEPHYR_CFLAGS="-I/usr/athena/include"
-- elif test -d /usr/include/zephyr ; then
-- ZEPHYR_CFLAGS="-I/usr/include"
-- elif test -d /usr/local/include/zephyr ; then
-- ZEPHYR_CFLAGS="-I/usr/local/include"
- fi
- AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.])
- AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno")
diff --git a/packages/gaim/pidgin_2.0.2.bb b/packages/gaim/pidgin_2.0.2.bb
deleted file mode 100644
index 2cc02c5072..0000000000
--- a/packages/gaim/pidgin_2.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
- file://sanitize-configure.ac.patch;patch=1 \
- file://gconf-no-errors.patch;patch=1 \
- file://pidgin.desktop-set-icon.patch;patch=1 \
- "
-
-PR = "r1"
diff --git a/packages/gaim/pidgin_2.1.1.bb b/packages/gaim/pidgin_2.1.1.bb
deleted file mode 100644
index 5531880669..0000000000
--- a/packages/gaim/pidgin_2.1.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
- file://sanitize-configure.ac.patch;patch=1 \
- file://gconf-no-errors.patch;patch=1 \
- file://pidgin.desktop-set-icon.patch;patch=1 \
- file://purple-OE-branding.patch;patch=1 \
- "
-
-PR = "r0"
diff --git a/packages/gaim/pidgin_2.2.1.bb b/packages/gaim/pidgin_2.2.1.bb
deleted file mode 100644
index 5531880669..0000000000
--- a/packages/gaim/pidgin_2.2.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
- file://sanitize-configure.ac.patch;patch=1 \
- file://gconf-no-errors.patch;patch=1 \
- file://pidgin.desktop-set-icon.patch;patch=1 \
- file://purple-OE-branding.patch;patch=1 \
- "
-
-PR = "r0"