diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/obsolete/gaim | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/obsolete/gaim')
29 files changed, 0 insertions, 1678 deletions
diff --git a/packages/obsolete/gaim/files/01-optional-icons-in-dialogs.patch b/packages/obsolete/gaim/files/01-optional-icons-in-dialogs.patch deleted file mode 100644 index 260dcf364f..0000000000 --- a/packages/obsolete/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/obsolete/gaim/files/02-request-field-dialogs.patch b/packages/obsolete/gaim/files/02-request-field-dialogs.patch deleted file mode 100644 index 50529ca53e..0000000000 --- a/packages/obsolete/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/obsolete/gaim/files/03-blist-dialogs.patch b/packages/obsolete/gaim/files/03-blist-dialogs.patch deleted file mode 100644 index 62d4710d46..0000000000 --- a/packages/obsolete/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); |
