From 146f079341b1df95c1166df1f2e1aaef2617c1f0 Mon Sep 17 00:00:00 2001 From: Juan Pablo Ugarte Date: Mon, 24 Mar 2014 19:07:46 -0300 Subject: Fixed distcheck errors Fixed create-widgets test GtkMessageDialog error and skip creating GtkAboutDialog --- plugins/gtk+/glade-gtk-message-dialog.c | 2 +- src/Makefile.am | 3 ++- tests/create-widgets.c | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/gtk+/glade-gtk-message-dialog.c b/plugins/gtk+/glade-gtk-message-dialog.c index 0464a560..0c7b2b9a 100644 --- a/plugins/gtk+/glade-gtk-message-dialog.c +++ b/plugins/gtk+/glade-gtk-message-dialog.c @@ -67,7 +67,7 @@ glade_gtk_message_dialog_image_determine_action (GtkMessageDialog * dialog, *image = g_value_get_object (value); if (*image == NULL) - if (glade_widget_get_from_gobject (dialog_image)) + if (dialog_image && glade_widget_get_from_gobject (dialog_image)) return MD_IMAGE_ACTION_RESET; else return MD_IMAGE_ACTION_INVALID; diff --git a/src/Makefile.am b/src/Makefile.am index e8ca9786..4b37f945 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,7 +37,8 @@ noinst_HEADERS = \ glade-resources.h \ glade-preferences.h \ glade-logo.h \ - glade-registration.h + glade-registration.h \ + glade-http.h # Generate resources glade-resources.h: glade-resources.gresource.xml $(UI_FILES) diff --git a/tests/create-widgets.c b/tests/create-widgets.c index ca2cd155..32b750ff 100644 --- a/tests/create-widgets.c +++ b/tests/create-widgets.c @@ -76,6 +76,13 @@ test_create_widget (gconstpointer data) g_assert (object_finalized); } +static gint +adaptor_cmp (gconstpointer a, gconstpointer b) +{ + return g_strcmp0 (glade_widget_adaptor_get_name ((gpointer)a), + glade_widget_adaptor_get_name ((gpointer)b)); +} + int main (int argc, char *argv[]) @@ -87,8 +94,8 @@ main (int argc, glade_init (); glade_app_get (); - adaptors = glade_widget_adaptor_list_adaptors (); - + adaptors = g_list_sort (glade_widget_adaptor_list_adaptors (), adaptor_cmp); + for (l = adaptors; l; l = l->next) { GladeWidgetAdaptor *adaptor = l->data; @@ -104,7 +111,9 @@ main (int argc, /* FIXME: App choosers leak some async operations after finalization, causing subsequent tests to fail */ !g_type_is_a (adaptor_type, GTK_TYPE_APP_CHOOSER) && /* FIXME: GtkRecentChooser tries to remove an unknown source id */ - !g_type_is_a (adaptor_type, GTK_TYPE_RECENT_CHOOSER)) + !g_type_is_a (adaptor_type, GTK_TYPE_RECENT_CHOOSER) && + /* FIXME: GtkAboutDialog in gtk 3.12 does not like to have widgets added in the action area by default */ + !g_type_is_a (adaptor_type, GTK_TYPE_ABOUT_DIALOG)) { gchar *test_path = g_strdup_printf ("/CreateWidget/%s", glade_widget_adaptor_get_name (adaptor)); -- cgit v1.2.1