Hello community, here is the log from the commit of package seamonkey for openSUSE:Factory checked in at Fri Aug 21 18:49:28 CEST 2009. -------- --- seamonkey/seamonkey.changes 2009-07-28 13:08:17.000000000 +0200 +++ seamonkey/seamonkey.changes 2009-08-20 11:06:56.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 20 11:04:44 CEST 2009 - wr@rosenauer.org + +- added Provides and Obsoletes for package merge (bnc#532678) +- allow alternative button order for Gtk filechooser (bnc#527418) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mozilla-gtkfilepicker-buttonorder.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.0sRIwP/_old 2009-08-21 18:46:55.000000000 +0200 +++ /var/tmp/diff_new_pack.0sRIwP/_new 2009-08-21 18:46:55.000000000 +0200 @@ -30,7 +30,7 @@ License: GPL v2 or later ; LGPL v2.1 or later ; MPL Provides: web_browser Version: 2.0b1 -Release: 2 +Release: 3 Summary: The successor of the Mozilla Application Suite Url: http://www.mozilla.org/projects/seamonkey Group: Productivity/Networking/Web/Browsers @@ -52,9 +52,14 @@ Patch6: mozilla-shared-nss-db.patch Patch7: seamonkey-shared-nss-db.patch Patch8: seamonkey-no-update.patch +Patch9: mozilla-gtkfilepicker-buttonorder.patch Patch10: mozilla-system-hunspell.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /bin/sh coreutils +Provides: seamonkey-mail = %{version} +Obsoletes: seamonkey-mail <= 2.0 +Provides: seamonkey-spellchecker = %{version} +Obsoletes: seamonkey-spellchecker <= 2.0 %define releasedate 2009072000 %define progname %{name} %define prefix /usr @@ -148,6 +153,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch9 -p1 pushd extensions %patch10 popd ++++++ mozilla-gtkfilepicker-buttonorder.patch ++++++ From: Wolfgang Rosenauer Subject: Gtk filechooser should support alternative button order (as used in KDE) References: http://bugzilla.novell.com/show_bug.cgi?id=527418 diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp --- a/widget/src/gtk2/nsFilePicker.cpp +++ b/widget/src/gtk2/nsFilePicker.cpp @@ -95,6 +95,7 @@ typedef GtkWidget* (*_gtk_file_chooser_d GtkFileChooserAction action, const gchar *first_button_text, ...); +typedef void (*_gtk_dialog_set_alternative_button_order_fn)(GtkDialog *dialog, gint first_response_id, ...); typedef void (*_gtk_file_chooser_set_select_multiple_fn)(GtkFileChooser* chooser, gboolean truth); typedef void (*_gtk_file_chooser_set_do_overwrite_confirmation_fn)(GtkFileChooser* chooser, gboolean do_confirm); typedef void (*_gtk_file_chooser_set_current_name_fn)(GtkFileChooser* chooser, const gchar* name); @@ -119,6 +120,7 @@ DECL_FUNC_PTR(gtk_file_chooser_get_filen DECL_FUNC_PTR(gtk_file_chooser_get_uri); DECL_FUNC_PTR(gtk_file_chooser_get_uris); DECL_FUNC_PTR(gtk_file_chooser_dialog_new); +DECL_FUNC_PTR(gtk_dialog_set_alternative_button_order); DECL_FUNC_PTR(gtk_file_chooser_set_select_multiple); DECL_FUNC_PTR(gtk_file_chooser_set_do_overwrite_confirmation); DECL_FUNC_PTR(gtk_file_chooser_set_current_name); @@ -214,6 +216,7 @@ nsFilePicker::LoadSymbolsGTK24() GET_LIBGTK_FUNC(gtk_file_chooser_get_uri); GET_LIBGTK_FUNC(gtk_file_chooser_get_uris); GET_LIBGTK_FUNC(gtk_file_chooser_dialog_new); + GET_LIBGTK_FUNC(gtk_dialog_set_alternative_button_order); GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple); GET_LIBGTK_FUNC_OPT(gtk_file_chooser_set_do_overwrite_confirmation); GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name); @@ -605,6 +608,12 @@ nsFilePicker::Show(PRInt16 *aReturn) GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, accept_button, GTK_RESPONSE_ACCEPT, NULL); + + _gtk_dialog_set_alternative_button_order(GTK_DIALOG(file_chooser), + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CANCEL, + -1); + if (mAllowURLs) { _gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org