commit e99827cb19352589919c072dbc18f0520c79956a (HEAD, gtk-2-24) Author: Cosimo Cecchi Date: Mon Feb 18 13:49:24 2013 -0500 release: update NEWS for 2.24.16 INSTALL.in | 2 +- NEWS | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) commit c25c2f0a41425e95456184e01039be878aa8191c Author: Cosimo Cecchi Date: Mon Feb 18 13:58:19 2013 -0500 Comment out a file chooser test that doesn't pass gtk/tests/filechooser.c | 2 ++ 1 file changed, 2 insertions(+) commit 950084ae18b6ce47cc2d3f5ef4f103438707156a (origin/gtk-2-24) Author: William Hua Date: Mon Feb 18 06:42:17 2013 -0500 Make GtkItemFactory produce GtkSeparatorMenuItems. https://bugzilla.gnome.org/show_bug.cgi?id=694077 gtk/gtkitemfactory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0004fe6cd44bf1033f606c0f9fe9a3784eeb4e73 Author: Federico Mena Quintero Date: Wed Feb 13 17:44:38 2013 -0600 filechooser: Remove test directory from testfilechooserbutton tests/testfilechooserbutton.c | 1 - 1 file changed, 1 deletion(-) commit 81df0059cbff1f658bf8ea70905ed2c01a1fec8c Author: Federico Mena Quintero Date: Wed Feb 13 15:21:12 2013 -0600 filechooserbutton: Add tests for SELECT_FOLDER mode with the dialog active Signed-off-by: Federico Mena Quintero gtk/tests/filechooser.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) commit 747a514cfb32a22b15f14c64c1f3a7e11544cf60 Author: Federico Mena Quintero Date: Wed Feb 13 15:07:33 2013 -0600 filechooser: Oops, cancel a file operation that was missing In addition, remove a list of pending_cancellables that was no longer being used. Signed-off-by: Federico Mena Quintero gtk/gtkfilechooserdefault.c | 18 ++++++------------ gtk/gtkfilechooserprivate.h | 1 - 2 files changed, 6 insertions(+), 13 deletions(-) commit 670fcf2c4110445b8ff766dc8f3d7f348fec66e0 Author: Federico Mena Quintero Date: Wed Feb 13 13:42:38 2013 -0600 filechooserbutton: Add a battery of tests for GtkFileChooserButton These are generic tests that can test the button in all of its modes, instead of hand-written tests for each combination. Some tests fail currently. Signed-off-by: Federico Mena Quintero gtk/tests/filechooser.c | 658 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 545 insertions(+), 113 deletions(-) commit 27eea79537bbbb08360680fec79f9cf3d16536e6 Author: Federico Mena Quintero Date: Wed Feb 13 12:12:50 2013 -0600 filechooserbutton: In SELECT_FOLDER mode, consider an empty selection to mean current_folder If the user didn't explicitly select anything, BUT the file chooser button has a current_folder set, do the same as what GtkFileChooserDefault would do: return the current folder as the selection. This makes the tests in tests/filechooser pass! Signed-off-by: Federico Mena Quintero gtk/gtkfilechooserbutton.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit ea3a1ecbd1259f1bb95b5482106344587cb47119 Author: Federico Mena Quintero Date: Wed Feb 13 11:47:35 2013 -0600 filechooserbutton: Keep track of the current_folder while the dialog is inactive This is analogous to keeping the selection while the dialog is inactive. Signed-off-by: Federico Mena Quintero gtk/gtkfilechooserbutton.c | 87 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 80 insertions(+), 7 deletions(-) commit c7cae86568a7f0e617704b488603c885f370ebc0 Author: Federico Mena Quintero Date: Wed Feb 13 11:14:36 2013 -0600 filechooser: Fix cast gtk/tests/filechooser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 97aaba834330cccb7867901b5d1dffe05c539ac6 Author: Federico Mena Quintero Date: Wed Feb 13 11:14:17 2013 -0600 filechooserbutton: Remove unused function prototypes gtk/gtkfilechooserprivate.h | 11 ----------- 1 file changed, 11 deletions(-) commit bfcaa4228c35d994bccb91c7369fa152d1df5d75 Author: Federico Mena Quintero Date: Wed Feb 13 11:01:50 2013 -0600 filechooserbutton: Restore to an empty previous selection properly If no file was originally selected in the GtkFileChooserButton, then its internal dialog is brought up and cancelled, then we need to restore the selection back to none. GtkFileChooser, though, doesn't like to select a NULL file, so call _unselect_all() in that condition. Signed-off-by: Federico Mena Quintero gtk/gtkfilechooserbutton.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) commit 5de08612dc8cf6970d2c795ec204482c18101c9d Author: Michael Natterer Date: Wed Feb 13 14:35:45 2013 +0100 gtk: reliably stop spinning when a GtkSpinButton is hidden Call stop_spinning() also in unrealize() because unmap() is not reliably called in GTK+ 2.x. This is not an issue in GTK+ 3.x. gtk/gtkspinbutton.c | 2 ++ 1 file changed, 2 insertions(+) commit 30a2f8edcc6d2ea912f582b621a82ea44ef4985b Author: Federico Mena Quintero Date: Mon Feb 11 23:12:20 2013 -0600 filechooserbutton: Add test for setting/getting the current folder; currently fails Signed-off-by: Federico Mena Quintero gtk/tests/filechooser.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) commit 1cfd1f372a897cc480478afb87a7835a7d2d1cf6 Author: Federico Mena Quintero Date: Mon Feb 11 23:03:26 2013 -0600 filechooserbutton: Fix preserving the selection after cancelling the dialog The button's underlying file chooser dialog should not be used to store the file selection while the dialog is unmapped. Instead, the file chooser button now stores the selection itself. Signed-off-by: Federico Mena Quintero gtk/gtkfilechooserbutton.c | 141 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 127 insertions(+), 14 deletions(-) commit e6f629f2bbdc009552f9b2eb99d4746014f095a5 Author: Federico Mena Quintero Date: Mon Feb 11 20:12:32 2013 -0600 filechooser: Remove some unused code Signed-off-by: Federico Mena Quintero gtk/gtkfilechooserdefault.c | 16 ---------------- 1 file changed, 16 deletions(-) commit 69bf331c980c576ad474e2388c6a7d4be8dd19f0 Author: Federico Mena Quintero Date: Mon Feb 11 19:33:17 2013 -0600 filechooserbutton: Simplify the code to preserve the selection while the dialog is running It used to fetch a possibly multiple selection from the GtkFileChooserDialog, and then pick just the first item from the selection list. But since GtkFileChooserButton operates in single-selection mode only, it can simply use gtk_file_chooser_get_file() instead. Also, the right way to reset the selection for GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER is with gtk_file_chooser_select_file(), not with _set_current_folder_file(). Signed-off-by: Federico Mena Quintero gtk/gtkfilechooserbutton.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) commit 0e79a04b66c588154e2b07be9c010fe9536dc843 Author: Federico Mena Quintero Date: Mon Feb 11 19:11:33 2013 -0600 filechooserbutton: Don't set a starting folder in the underlying dialog Let the dialog decide by itself. gtk/gtkfilechooserbutton.c | 25 ------------------------- 1 file changed, 25 deletions(-) commit 2900fa9b62f594f780a4c9f69075f6221bbb1448 Author: Federico Mena Quintero Date: Mon Feb 11 18:19:45 2013 -0600 filechooser: Test canceling the dialog inside a GtkFileChooserButton Signed-off-by: Federico Mena Quintero gtk/tests/filechooser.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) commit 1130a7c6f2ddb79a3b8351eab0d096125d1e1652 Author: Federico Mena Quintero Date: Mon Feb 11 18:19:26 2013 -0600 Remove unused variable gtk/gtkfilechooserbutton.c | 2 -- 1 file changed, 2 deletions(-) commit 71505d982b0f8ce719885f5f9c4c36b0042efb01 Author: Sebastian Geiger Date: Fri Aug 31 12:02:00 2012 -0500 [GtkFileChooserButton] bgo#645065 - Restore the previously-selected file when the button's GtkFileChooserDialog is canceled The file chooser is asynchronous, so doing 'select_file (old_file)' and subsequently querying the file for updating the labels is not going to work. However, the underlying file chooser will emit 'selection-changed' as appropriate when it finishes restoring the old file. So, we only need to update the labels when the file chooser dialog is confirmed, not cancelled. gtk/gtkfilechooserbutton.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit e0cfc911fdfa603b23e4b2d5da5639a38a4d3fc1 Author: Federico Mena Quintero Date: Mon Feb 11 17:50:33 2013 -0600 filechooser: Add a couple of tests for GtkFileChooserButton; they fail now Signed-off-by: Federico Mena Quintero gtk/tests/filechooser.c | 62 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 4 deletions(-) commit 5807a190315aac93496a40a349409ee5b903d025 Author: Federico Mena Quintero Date: Mon Feb 11 15:20:46 2013 -0600 filechooser: Do tests with g_assert_cmpstr(), not g_assert(passed) This lets us see exactly what failed, instead of just seeing a boolean error value. Signed-off-by: Federico Mena Quintero gtk/tests/filechooser.c | 58 ++++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 42 deletions(-) commit 96602b29e263a03e813132fd31d0df196b181f17 Author: Federico Mena Quintero Date: Mon Feb 11 15:11:26 2013 -0600 filechooser: Move some of the tests to GTestDataFunc This code came from a home-grown testing mechanism, which didn't aggregate tests into a test suite; it just ran them one by one. Here we move some of that machinery to GTestDataFunc for more flexibility in running tests. Signed-off-by: Federico Mena Quintero gtk/tests/filechooser.c | 117 ++++++++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 49 deletions(-) commit e14808fdd32c8d09b0c2c3eb4081df8773ca5357 Author: Federico Mena Quintero Date: Mon Feb 11 13:38:58 2013 -0600 filechooser: Get the filechooser tests to build Some are ifdef-ed out with BROKEN_TESTS, but at least the tests will compile for now. gtk/tests/Makefile.am | 2 +- gtk/tests/filechooser.c | 25 ++++++++++++++++--------- tests/testfilechooserbutton.c | 2 ++ 3 files changed, 19 insertions(+), 10 deletions(-) commit 2ffaa468e5e6d565f72c0c3e2c2e1b4e7b287af3 Author: Matthias Clasen Date: Sat Feb 9 18:33:04 2013 -0500 post-release version bump configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 84e1e808398a5a2679547e4b4c23ab50ba745ccf (tag: 2.24.15)