diff options
Diffstat (limited to 'tests')
34 files changed, 76 insertions, 9 deletions
diff --git a/tests/prop-editor.c b/tests/prop-editor.c index 33e470e6af..5d18c7d8ca 100644 --- a/tests/prop-editor.c +++ b/tests/prop-editor.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include <config.h> #include <string.h> #undef GTK_DISABLE_DEPRECATED diff --git a/tests/simple.c b/tests/simple.c index 9e57e357ac..46dfd15d50 100644 --- a/tests/simple.c +++ b/tests/simple.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> diff --git a/tests/stresstest-toolbar.c b/tests/stresstest-toolbar.c index 370acc1bd2..74fbcbf470 100644 --- a/tests/stresstest-toolbar.c +++ b/tests/stresstest-toolbar.c @@ -18,6 +18,7 @@ * Boston, MA 02111-1307, USA. */ #undef GTK_DISABLE_DEPRECATED +#include <config.h> #include <gtk/gtk.h> typedef struct _Info Info; diff --git a/tests/testactions.c b/tests/testactions.c index 9c3939b9ae..8acb5ca111 100644 --- a/tests/testactions.c +++ b/tests/testactions.c @@ -1,4 +1,5 @@ #undef GTK_DISABLE_DEPRECATED +#include <config.h> #include <gtk/gtk.h> static GtkActionGroup *action_group = NULL; diff --git a/tests/testcalendar.c b/tests/testcalendar.c index ed0f480d14..618de95d1e 100644 --- a/tests/testcalendar.c +++ b/tests/testcalendar.c @@ -18,6 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <config.h> #include <stdio.h> #include <string.h> #include <gtk/gtk.h> diff --git a/tests/testcombo.c b/tests/testcombo.c index f5a02c4543..2fc79715db 100644 --- a/tests/testcombo.c +++ b/tests/testcombo.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> #include <gtk/gtkcellview.h> #include <gtk/gtkcellviewmenuitem.h> diff --git a/tests/testcombochange.c b/tests/testcombochange.c index 965460f551..f673a40669 100644 --- a/tests/testcombochange.c +++ b/tests/testcombochange.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> #include <stdarg.h> diff --git a/tests/testdnd.c b/tests/testdnd.c index 88ff0345ed..55d50f16a4 100644 --- a/tests/testdnd.c +++ b/tests/testdnd.c @@ -1,3 +1,4 @@ +#include <config.h> #include "gtk/gtk.h" /* Target side drag signals */ diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c index a05b90d043..fdee669ea4 100644 --- a/tests/testentrycompletion.c +++ b/tests/testentrycompletion.c @@ -1,4 +1,5 @@ +#include <config.h> #include <gtk/gtk.h> /* Don't copy this bad example; inline RGB data is always a better diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c index a64f629a29..24cd1604bf 100644 --- a/tests/testfilechooser.c +++ b/tests/testfilechooser.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <string.h> #include <sys/types.h> @@ -300,31 +300,69 @@ update_preview_cb (GtkFileChooser *chooser) } static void +set_current_folder (GtkFileChooser *chooser, + const char *name) +{ + if (!gtk_file_chooser_set_current_folder (chooser, name)) + { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new (GTK_WINDOW (chooser), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "Could not set the folder to %s", + name); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } +} + +static void set_folder_nonexistent_cb (GtkButton *button, GtkFileChooser *chooser) { - gtk_file_chooser_set_current_folder (chooser, "/nonexistent"); + set_current_folder (chooser, "/nonexistent"); } static void set_folder_existing_nonexistent_cb (GtkButton *button, GtkFileChooser *chooser) { - gtk_file_chooser_set_current_folder (chooser, "/usr/nonexistent"); + set_current_folder (chooser, "/usr/nonexistent"); +} + +static void +set_filename (GtkFileChooser *chooser, + const char *name) +{ + if (!gtk_file_chooser_set_filename (chooser, name)) + { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new (GTK_WINDOW (chooser), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "Could not select %s", + name); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } } static void set_filename_nonexistent_cb (GtkButton *button, GtkFileChooser *chooser) { - gtk_file_chooser_set_filename (chooser, "/nonexistent"); + set_filename (chooser, "/nonexistent"); } static void set_filename_existing_nonexistent_cb (GtkButton *button, GtkFileChooser *chooser) { - gtk_file_chooser_set_filename (chooser, "/usr/nonexistent"); + set_filename (chooser, "/usr/nonexistent"); } int diff --git a/tests/testgtk.c b/tests/testgtk.c index 6f30fe94f8..e3949ccadc 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -26,7 +26,7 @@ #undef GTK_DISABLE_DEPRECATED -#include "config.h" +#include <config.h> #undef G_LOG_DOMAIN diff --git a/tests/testicontheme.c b/tests/testicontheme.c index 0290443f53..e4ecccd1d4 100644 --- a/tests/testicontheme.c +++ b/tests/testicontheme.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtkicontheme.h> #include <stdlib.h> #include <string.h> diff --git a/tests/testinput.c b/tests/testinput.c index ad14b088b2..275ee19f1a 100644 --- a/tests/testinput.c +++ b/tests/testinput.c @@ -24,6 +24,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#include <config.h> #include <stdio.h> #include "gtk/gtk.h" diff --git a/tests/testmenus.c b/tests/testmenus.c index 299050d66d..f4c963872c 100644 --- a/tests/testmenus.c +++ b/tests/testmenus.c @@ -7,6 +7,7 @@ */ #undef GTK_DISABLE_DEPRECATED +#include <config.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> diff --git a/tests/testmerge.c b/tests/testmerge.c index 98f508cbef..d1c6e4781d 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c index 975b4caf7d..060202a5db 100644 --- a/tests/testmultidisplay.c +++ b/tests/testmultidisplay.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> #include <gtk/gtkstock.h> #include <gdk/gdk.h> diff --git a/tests/testmultiscreen.c b/tests/testmultiscreen.c index 04a83157ef..ba7170e17f 100644 --- a/tests/testmultiscreen.c +++ b/tests/testmultiscreen.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> static GtkWidget **images; diff --git a/tests/testrgb.c b/tests/testrgb.c index 52cf9878d5..d145e74755 100644 --- a/tests/testrgb.c +++ b/tests/testrgb.c @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/tests/testselection.c b/tests/testselection.c index 3db76c8d28..c430073b68 100644 --- a/tests/testselection.c +++ b/tests/testselection.c @@ -26,6 +26,7 @@ #undef GTK_DISABLE_DEPRECATED +#include <config.h> #include <stdio.h> #include <string.h> #define GTK_ENABLE_BROKEN diff --git a/tests/testsocket.c b/tests/testsocket.c index 85a7192d74..682a3354cd 100644 --- a/tests/testsocket.c +++ b/tests/testsocket.c @@ -1,5 +1,6 @@ #undef GTK_DISABLE_DEPRECATED +#include <config.h> #include <gtk/gtk.h> #include <string.h> diff --git a/tests/testsocket_child.c b/tests/testsocket_child.c index ae24efd892..d0bbbb6bd4 100644 --- a/tests/testsocket_child.c +++ b/tests/testsocket_child.c @@ -1,3 +1,4 @@ +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/testsocket_common.c b/tests/testsocket_common.c index 2e2aa05328..9fc246c43b 100644 --- a/tests/testsocket_common.c +++ b/tests/testsocket_common.c @@ -1,5 +1,6 @@ #undef GTK_DISABLE_DEPRECATED +#include <config.h> #include "x11/gdkx.h" #include <gtk/gtk.h> diff --git a/tests/testtext.c b/tests/testtext.c index ef22c2b050..9aa6572d26 100644 --- a/tests/testtext.c +++ b/tests/testtext.c @@ -1,3 +1,4 @@ +#include <config.h> #include <stdio.h> #include <sys/stat.h> #include <errno.h> diff --git a/tests/testtextbuffer.c b/tests/testtextbuffer.c index 808eea6fa3..8622851418 100644 --- a/tests/testtextbuffer.c +++ b/tests/testtextbuffer.c @@ -1,6 +1,7 @@ /* Simplistic test suite */ +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/testthreads.c b/tests/testthreads.c index 2d1e62f1d2..f3aaeafa36 100644 --- a/tests/testthreads.c +++ b/tests/testthreads.c @@ -27,7 +27,7 @@ #include <stdio.h> #include <unistd.h> #include <gtk/gtk.h> -#include "config.h" +#include <config.h> #ifdef USE_PTHREADS #include <pthread.h> diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c index c6e8d8237c..3d19af6b42 100644 --- a/tests/testtoolbar.c +++ b/tests/testtoolbar.c @@ -20,6 +20,7 @@ * Boston, MA 02111-1307, USA. */ #undef GTK_DISABLE_DEPRECATED +#include <config.h> #include <gtk/gtk.h> #include "prop-editor.h" diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c index 660d4650b5..1018f4ccfb 100644 --- a/tests/testtreecolumns.c +++ b/tests/testtreecolumns.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> /* diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c index 5cf2090234..8303d39fb9 100644 --- a/tests/testtreeedit.c +++ b/tests/testtreeedit.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> typedef struct { diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c index ffc0b8650e..6f87df0cba 100644 --- a/tests/testtreeflow.c +++ b/tests/testtreeflow.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> GtkTreeModel *model = NULL; diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c index 5e2993b7f0..123a88b376 100644 --- a/tests/testtreefocus.c +++ b/tests/testtreefocus.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> typedef struct _TreeStruct TreeStruct; diff --git a/tests/testtreesort.c b/tests/testtreesort.c index 3801c7b765..74b5c276e6 100644 --- a/tests/testtreesort.c +++ b/tests/testtreesort.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> #include "../gtk/gtktreedatalist.h" diff --git a/tests/testtreeview.c b/tests/testtreeview.c index 4dc4b586f3..cedf768c76 100644 --- a/tests/testtreeview.c +++ b/tests/testtreeview.c @@ -1,4 +1,5 @@ #undef GTK_DISABLE_DEPRECATED +#include <config.h> #include <string.h> #include "prop-editor.h" #include <gtk/gtk.h> diff --git a/tests/testxinerama.c b/tests/testxinerama.c index 80570a1bab..5517d4e642 100644 --- a/tests/testxinerama.c +++ b/tests/testxinerama.c @@ -1,3 +1,4 @@ +#include <config.h> #include <stdlib.h> #include <gtk/gtk.h> diff --git a/tests/treestoretest.c b/tests/treestoretest.c index 1946d9e04e..f921560a5c 100644 --- a/tests/treestoretest.c +++ b/tests/treestoretest.c @@ -1,3 +1,4 @@ +#include <config.h> #include <gtk/gtk.h> #include <stdlib.h> #include <string.h> |