Merge lp:~elementary-apps/granite/aboutdialog-crash into lp:~elementary-pantheon/granite/granite

[xapantu]

Solve crash when using the --about command line parameter by avoiding improper type casting.

Fix a crash in the about dialog (with pantheon-files, or audience for instance). It appears when the hardening options are enabled.

=== modified file 'lib/Widgets/AboutDialog.vala'
--- lib/Widgets/AboutDialog.vala	2014-08-09 16:06:37 +0000
+++ lib/Widgets/AboutDialog.vala	2014-08-29 20:26:42 +0000
@@ -117,5 +117,5 @@
         }
     }
 
-    public extern void show_about_dialog (Gtk.Window *parent, ...);
+    public extern void show_about_dialog (Gtk.Window *parent, string first, ...);
 }

=== modified file 'lib/Widgets/widgets-utils.c'
--- lib/Widgets/widgets-utils.c	2012-11-30 18:06:35 +0000
+++ lib/Widgets/widgets-utils.c	2014-08-29 20:26:42 +0000
@@ -67,7 +67,7 @@
     if (!dialog)
     {
         //dialog = gtk_about_dialog_new ();
-        dialog = granite_widgets_about_dialog_new ();
+        dialog = GTK_WIDGET (granite_widgets_about_dialog_new ());
         g_object_ref_sink (dialog);
 
         g_signal_connect (dialog, "delete-event",

=== modified file 'lib/Widgets/widgets-utils.h'
--- lib/Widgets/widgets-utils.h	2012-11-30 18:06:35 +0000
+++ lib/Widgets/widgets-utils.h	2014-08-29 20:26:42 +0000
@@ -1,6 +1,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
+#include <granite.h>
 
 void    granite_widgets_show_about_dialog (GtkWindow   *parent,
                                            const gchar *first_property_name,
-                                           ...);
+                                           ...);
\ No newline at end of file