From 5e0f1e770e5721d45d9d3ceca49aee1901e5462c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 30 Aug 2005 14:26:29 +0000 Subject: gpe-session-scripts: Fix typo. --- packages/gpe-session-scripts/gpe-session-scripts_0.65.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb index e43f32ef82..d7a3054149 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe- DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" SRC_URI += "file://matchbox-session \ - file://disable-composite.xsetting" + file://disable-composite.xsettings" do_install_append() { install -d ${D}${sysconfdir}/gpe/xsettings-default.d -- cgit v1.2.3 From eee22b96a937c195c3c9203de50d4f7f917184a7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 30 Aug 2005 14:40:49 +0000 Subject: gaim: update packages/gaim as per bug #273 --- .../gaim/files/01-optional-icons-in-dialogs.patch | 514 +++++++++++++++++++++ packages/gaim/files/02-request-field-dialogs.patch | 116 +++++ packages/gaim/files/03-blist-dialogs.patch | 240 ++++++++++ packages/gaim/files/04-saved-status-dialogs.patch | 40 ++ packages/gaim/files/05-statusbox-icon-size.patch | 15 + packages/gaim/files/06-account-dialogs.patch | 219 +++++++++ packages/gaim/files/07-roomlist-dialog.patch | 67 +++ packages/gaim/files/08-prefs-dialog.patch | 63 +++ packages/gaim/files/09-filetransfer-dialog.patch | 52 +++ packages/gaim/files/10-pda-default-settings.patch | 13 + packages/gaim/files/define-pda-mode.patch | 36 ++ packages/gaim/files/desktop-name-2.0.0.patch | 27 ++ packages/gaim/files/docklet-icon-size.patch | 13 + .../files/no-superimposed-version-on-logo.patch | 19 + packages/gaim/files/series | 14 + packages/gaim/gaim.inc | 2 +- packages/gaim/gaim_1.5.0.bb | 2 +- packages/gaim/gaim_2.0.0-cvs-mco1.bb | 33 ++ packages/gaim/gaim_cvs.bb | 21 + 19 files changed, 1504 insertions(+), 2 deletions(-) create mode 100644 packages/gaim/files/01-optional-icons-in-dialogs.patch create mode 100644 packages/gaim/files/02-request-field-dialogs.patch create mode 100644 packages/gaim/files/03-blist-dialogs.patch create mode 100644 packages/gaim/files/04-saved-status-dialogs.patch create mode 100644 packages/gaim/files/05-statusbox-icon-size.patch create mode 100644 packages/gaim/files/06-account-dialogs.patch create mode 100644 packages/gaim/files/07-roomlist-dialog.patch create mode 100644 packages/gaim/files/08-prefs-dialog.patch create mode 100644 packages/gaim/files/09-filetransfer-dialog.patch create mode 100644 packages/gaim/files/10-pda-default-settings.patch create mode 100644 packages/gaim/files/define-pda-mode.patch create mode 100644 packages/gaim/files/desktop-name-2.0.0.patch create mode 100644 packages/gaim/files/docklet-icon-size.patch create mode 100644 packages/gaim/files/no-superimposed-version-on-logo.patch create mode 100644 packages/gaim/files/series create mode 100644 packages/gaim/gaim_2.0.0-cvs-mco1.bb create mode 100644 packages/gaim/gaim_cvs.bb diff --git a/packages/gaim/files/01-optional-icons-in-dialogs.patch b/packages/gaim/files/01-optional-icons-in-dialogs.patch new file mode 100644 index 0000000000..260dcf364f --- /dev/null +++ b/packages/gaim/files/01-optional-icons-in-dialogs.patch @@ -0,0 +1,514 @@ +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 new file mode 100644 index 0000000000..50529ca53e --- /dev/null +++ b/packages/gaim/files/02-request-field-dialogs.patch @@ -0,0 +1,116 @@ +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 new file mode 100644 index 0000000000..62d4710d46 --- /dev/null +++ b/packages/gaim/files/03-blist-dialogs.patch @@ -0,0 +1,240 @@ +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 new file mode 100644 index 0000000000..2cdf70c5c1 --- /dev/null +++ b/packages/gaim/files/04-saved-status-dialogs.patch @@ -0,0 +1,40 @@ +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 new file mode 100644 index 0000000000..88379da435 --- /dev/null +++ b/packages/gaim/files/05-statusbox-icon-size.patch @@ -0,0 +1,15 @@ +Identiske underkataloger: src2/CVS og src/CVS +Identiske underkataloger: src2/.deps og src/.deps +Index: gaim/src/gtkstatusbox.c +=================================================================== +--- gaim.orig/src/gtkstatusbox.c 2005-04-24 21:52:29.000000000 +0200 ++++ gaim/src/gtkstatusbox.c 2005-08-19 21:22:49.719366944 +0200 +@@ -169,7 +169,7 @@ + GtkCellRenderer *icon_rend = gtk_cell_renderer_pixbuf_new(); + GtkTextBuffer *buffer; + GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4; +- GtkIconSize icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS); ++ GtkIconSize 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 new file mode 100644 index 0000000000..9d2cb9acb0 --- /dev/null +++ b/packages/gaim/files/06-account-dialogs.patch @@ -0,0 +1,219 @@ +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 new file mode 100644 index 0000000000..2806c78fd4 --- /dev/null +++ b/packages/gaim/files/07-roomlist-dialog.patch @@ -0,0 +1,67 @@ +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 new file mode 100644 index 0000000000..15c66b583a --- /dev/null +++ b/packages/gaim/files/08-prefs-dialog.patch @@ -0,0 +1,63 @@ +Index: gaim/src/gtkprefs.c +=================================================================== +--- gaim.orig/src/gtkprefs.c 2005-08-21 01:59:55.000000000 +0200 ++++ gaim/src/gtkprefs.c 2005-08-21 02:49:51.635872168 +0200 +@@ -2106,8 +2106,19 @@ + g_object_unref(pixbuf); + if (icon) + g_object_unref(icon); +- +- return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); ++ ++ //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() { +@@ -2140,9 +2151,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)); +@@ -2170,11 +2181,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); +@@ -2184,7 +2197,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 new file mode 100644 index 0000000000..c4fa3a0a6d --- /dev/null +++ b/packages/gaim/files/09-filetransfer-dialog.patch @@ -0,0 +1,52 @@ +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 new file mode 100644 index 0000000000..953dc11612 --- /dev/null +++ b/packages/gaim/files/10-pda-default-settings.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000000..f1a368bc73 --- /dev/null +++ b/packages/gaim/files/define-pda-mode.patch @@ -0,0 +1,36 @@ +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 new file mode 100644 index 0000000000..c921619721 --- /dev/null +++ b/packages/gaim/files/desktop-name-2.0.0.patch @@ -0,0 +1,27 @@ +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/docklet-icon-size.patch b/packages/gaim/files/docklet-icon-size.patch new file mode 100644 index 0000000000..6b8047a30c --- /dev/null +++ b/packages/gaim/files/docklet-icon-size.patch @@ -0,0 +1,13 @@ +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/no-superimposed-version-on-logo.patch b/packages/gaim/files/no-superimposed-version-on-logo.patch new file mode 100644 index 0000000000..86809dfe98 --- /dev/null +++ b/packages/gaim/files/no-superimposed-version-on-logo.patch @@ -0,0 +1,19 @@ +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/series b/packages/gaim/files/series new file mode 100644 index 0000000000..c7a16f71c1 --- /dev/null +++ b/packages/gaim/files/series @@ -0,0 +1,14 @@ +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 index 5ccbdafec2..4b5f22b515 100644 --- a/packages/gaim/gaim.inc +++ b/packages/gaim/gaim.inc @@ -1,6 +1,6 @@ SECTION = "x11/network" DESCRIPTION = "multi-protocol instant messaging client" -MAINTAINER = "Phil Blundell " +MAINTAINER = "Mads Chr. Olesen " LICENSE = "GPL" DEPENDS = "gtk+ gnutls virtual/libintl" diff --git a/packages/gaim/gaim_1.5.0.bb b/packages/gaim/gaim_1.5.0.bb index 5d82dd1e4b..fe06cb8e44 100644 --- a/packages/gaim/gaim_1.5.0.bb +++ b/packages/gaim/gaim_1.5.0.bb @@ -1,7 +1,7 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ - file://desktop-name_1.5.0.patch;patch=1" + file://desktop-name.patch;patch=1" include gaim.inc diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb new file mode 100644 index 0000000000..5ead9aa01e --- /dev/null +++ b/packages/gaim/gaim_2.0.0-cvs-mco1.bb @@ -0,0 +1,33 @@ +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ + file://no-superimposed-version-on-logo.patch;patch=1 \ + file://01-optional-icons-in-dialogs.patch;patch=1 \ + file://02-request-field-dialogs.patch;patch=1 \ + file://03-blist-dialogs.patch;patch=1 \ + file://04-saved-status-dialogs.patch;patch=1 \ + file://05-statusbox-icon-size.patch;patch=1 \ + file://06-account-dialogs.patch;patch=1 \ + file://07-roomlist-dialog.patch;patch=1 \ + file://define-pda-mode.patch;patch=1 \ + file://desktop-name-2.0.0.patch;patch=1 \ + file://docklet-icon-size.patch;patch=1 \ + file://08-prefs-dialog.patch;patch=1 \ + file://09-filetransfer-dialog.patch;patch=1 \ + file://10-pda-default-settings.patch;patch=1 \ + " + +include 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" diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb new file mode 100644 index 0000000000..cd42cc93f2 --- /dev/null +++ b/packages/gaim/gaim_cvs.bb @@ -0,0 +1,21 @@ +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ + file://no-superimposed-version-on-logo.patch;patch=1 \ + file://desktop-name-2.0.0.patch;patch=1 \ + " + +include 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" -- cgit v1.2.3 From 8d442f4201aad8dcc782a9b53ec4a9c419c7e86f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 30 Aug 2005 14:44:40 +0000 Subject: gpe-session-scripts 0.65: fix patch URI, closes bug #275 --- packages/gpe-session-scripts/gpe-session-scripts_0.65.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb index e43f32ef82..d7a3054149 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe- DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" SRC_URI += "file://matchbox-session \ - file://disable-composite.xsetting" + file://disable-composite.xsettings" do_install_append() { install -d ${D}${sysconfdir}/gpe/xsettings-default.d -- cgit v1.2.3 From 99aef3c8d257c4fabe437e5b2f2dcea4165e88a5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 30 Aug 2005 14:52:03 +0000 Subject: preferred-gpe-versions-2.7.inc: update gpe-login and gpe-session-scripts --- conf/distro/preferred-gpe-versions-2.7.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 24ee5c0e13..eff175d098 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -38,8 +38,8 @@ PREFERRED_VERSION_xst ?= "0.15" PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xhost ?= "0.0cvs20040413" PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_gpe-login ?= "0.81" -PREFERRED_VERSION_gpe-session-scripts ?= "0.63" +PREFERRED_VERSION_gpe-login ?= "0.82" +PREFERRED_VERSION_gpe-session-scripts ?= "0.65" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.54" PREFERRED_VERSION_gpe-calendar ?= "0.64" -- cgit v1.2.3 From 41f483060e28d0f916569e81bc88879bec2e636b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 30 Aug 2005 15:26:45 +0000 Subject: pcmcia: ship dedicated ide.opts for borzoi --- .../initscripts/initscripts-1.0/borzoi/devices | 0 .../pcmcia-cs-3.2.8/borzoi/.mtn2git_empty | 0 packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts | 28 ++++++++++++++++++++++ 3 files changed, 28 insertions(+) mode change 100644 => 100755 packages/initscripts/initscripts-1.0/borzoi/devices create mode 100644 packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty create mode 100644 packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts diff --git a/packages/initscripts/initscripts-1.0/borzoi/devices b/packages/initscripts/initscripts-1.0/borzoi/devices old mode 100644 new mode 100755 diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty b/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts b/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts new file mode 100644 index 0000000000..c67df8e348 --- /dev/null +++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/borzoi/ide.opts @@ -0,0 +1,28 @@ +# ATA/IDE drive adapter configuration +# +# The address format is "scheme,socket,serial_no[,part]". +# +# For multi-partition devices, first return list of partitions in +# $PARTS. Then, we'll get called for each partition. +# +case "$ADDRESS" in +*,1,*,*) + # Socket 1 is the internal HD; don't do anything clever as it's / + ;; +*,*,*,1) + #INFO="Sample IDE setup" + DO_FSTAB="n"; + #DO_FSCK="y" ; + DO_MOUNT="y" + #FSTYPE="msdos" + #FSTYPE="auto" + #OPTS="" + #MOUNTPT="/mnt/ide" + ;; +*,*,*) + PARTS="1" + # Card eject policy options + NO_CHECK=n + NO_FUSER=y + ;; +esac -- cgit v1.2.3 From a88ba31b220ec67f344b931af7718d1238b173b1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 30 Aug 2005 17:53:15 +0000 Subject: tslib: change ts.conf-h2200 to use module_raw for h2200 to include it in the calibration, bump PR --- packages/tslib/tslib/ts.conf-h2200 | 2 +- packages/tslib/tslib_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tslib/tslib/ts.conf-h2200 b/packages/tslib/tslib/ts.conf-h2200 index ece916f39e..6a6a231139 100644 --- a/packages/tslib/tslib/ts.conf-h2200 +++ b/packages/tslib/tslib/ts.conf-h2200 @@ -1,5 +1,5 @@ module_raw input -module linear_h2200 +module_raw linear_h2200 module pthres pmin=1 module variance delta=30 module dejitter delta=100 diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 80fd8f2966..e010333994 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0cvs${CVSDATE}" -PR = "r29" +PR = "r30" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" -- cgit v1.2.3 From 25e2b69ba5619c9d5644f51d8d997f491e7713e8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 30 Aug 2005 17:57:56 +0000 Subject: zaurus-clamshell-2.6.conf: revert accidant commit that outcommented several modules --- conf/machine/zaurus-clamshell-2.6.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index b3e0a50bc6..19a06405ce 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" # Infrared Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm -# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm + kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" # USB Gadget Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ -# kernel-module-g-serial kernel-module-g-ether" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ + kernel-module-g-serial kernel-module-g-ether" -- cgit v1.2.3 From 452adc733d3df06a455d1def1a76c6382ac560e4 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 30 Aug 2005 18:30:44 +0000 Subject: glurp: update version, switch to SF mirror --- packages/musicpd/glurp_0.11.3.bb | 13 ------------- packages/musicpd/glurp_0.11.6.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 packages/musicpd/glurp_0.11.3.bb create mode 100644 packages/musicpd/glurp_0.11.6.bb diff --git a/packages/musicpd/glurp_0.11.3.bb b/packages/musicpd/glurp_0.11.3.bb deleted file mode 100644 index b74100a985..0000000000 --- a/packages/musicpd/glurp_0.11.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "glurp - frontend for mpd" -HOMEPAGE = "http://www.musicpd.org/glurp.shtml" -LICENSE = "GPLv2" -MAINTAINER = "Justin Patrin " -SECTION = "gnome/multimedia" -DEPENDS = "gtk+ libglade" -PR = "r0" - -SRC_URI = "http://mercury.chem.pitt.edu/~shank/glurp-${PV}.tar.gz" - -LDFLAGS += "-export-dynamic" - -inherit autotools diff --git a/packages/musicpd/glurp_0.11.6.bb b/packages/musicpd/glurp_0.11.6.bb new file mode 100644 index 0000000000..ff702325cb --- /dev/null +++ b/packages/musicpd/glurp_0.11.6.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "glurp - frontend for mpd" +HOMEPAGE = "http://www.musicpd.org/glurp.shtml" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin " +SECTION = "gnome/multimedia" +DEPENDS = "gtk+ libglade" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/glurp/glurp-${PV}.tar.gz" + +LDFLAGS += "-export-dynamic" + +inherit autotools -- cgit v1.2.3 From a2af2e93089ec7d3c182633e4a8713f566369ed3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 Aug 2005 19:17:02 +0000 Subject: linux-oz-2.6: Update detection routines to correctly detect corgi and shepherd. Very nasty to get this wrongMT: ---------------------------------------------------------------------- --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 12a05e23f0..51e67763a5 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r18" +PR = "r19" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -57,7 +57,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \ ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \ ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ - ${RPSRC}/sharpsl_detection-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_detection-r1.patch;patch=1 \ ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ ${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \ ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \ -- cgit v1.2.3 From f1399e3048c1e235b47d720fc8ad19147b6d1995 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 30 Aug 2005 20:57:25 +0000 Subject: fixed typo in conf/zaurus-clamshell-2.6.conf --- conf/machine/zaurus-clamshell-2.6.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 19a06405ce..516b07ee15 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,7 +27,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" # Infrared Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" # USB Gadget Modules -- cgit v1.2.3 From 3cea4e45f12fb28b0081b7a090818ab487805f02 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 30 Aug 2005 20:58:41 +0000 Subject: ttf-dejavu: archive mirrored on my account on handhelds.org - close bug#272 --- packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb b/packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb index 6a328b4547..bd10c9a431 100644 --- a/packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb +++ b/packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" PV = "1.13-snapshot-20050820" #SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz" -SRC_URI = "http://dejavu.sourceforge.net/snapshots/dejavu-ttf-20050820.tar.gz" +SRC_URI = "http://handhelds.org/~hrw/mirror/dejavu-ttf-20050820.tar.gz" include ttf.inc -- cgit v1.2.3 From 53c47d8a86fb60b25e0a5e10174a5104fb449c3d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 30 Aug 2005 21:07:41 +0000 Subject: gpesyncd: add cvs version of gpesyncd till it sees a release NOTE: it needs libmimedir_cvs, but OE doesn't have a clean way to specify that ~lart OE --- packages/gpesyncd/.mtn2git_empty | 0 packages/gpesyncd/gpesyncd_cvs.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 packages/gpesyncd/.mtn2git_empty create mode 100644 packages/gpesyncd/gpesyncd_cvs.bb diff --git a/packages/gpesyncd/.mtn2git_empty b/packages/gpesyncd/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb new file mode 100644 index 0000000000..c6c8230a89 --- /dev/null +++ b/packages/gpesyncd/gpesyncd_cvs.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +DESCRIPTION = "Sync daemon for GPE and OpenSync" +MAINTAINER = "Koen Kooi " + + +SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/gpesyncd" + +DEPENDS = "libgpevtype sqlite libmimedir glib-2.0" + +S = "${WORKDIR}/${PN}" +PV = "0.0+cvs-${CVSDATE}" +PR = "r0" + +inherit autotools + +FILES_${PN} += "${datadir}/gpe" + -- cgit v1.2.3