Merge lp:~ricotz/granite/aboutdialog into lp:~elementary-pantheon/granite/granite

[Rico Tzschichholz]

Replace the c-source handling the presentation of AboutDialog with vala

[David Gomes (davidgomes)]

+1 for replacing this C part with Vala.
Code Style approved and my not-very-thourough tests passed.

review: Approve

=== modified file 'lib/Application.vala'
--- lib/Application.vala	2012-11-10 19:18:57 +0000
+++ lib/Application.vala	2012-11-12 21:25:25 +0000
@@ -148,31 +148,53 @@
          */
         public virtual void show_about (Gtk.Widget parent) {
 
-            assert(parent is Gtk.Window);
-            Granite.Widgets.show_about_dialog ((Gtk.Window) parent, 
-                                               "program_name", program_name,
-                                               "version", build_version,
-                                               "logo_icon_name", app_icon,
-
-                                               "comments", about_comments,
-                                               "copyright", "%s %s Developers".printf (app_years, program_name),
-                                               "website", main_url,
-                                               "website_label", "Website",
-
-                                               "authors", about_authors,
-                                               "documenters", about_documenters,
-                                               "artists", about_artists,
-                                               "translator_credits", about_translators,
-                                               "license", about_license,
-                                               "license_type", about_license_type,
-
-                                               "help", help_url,
-                                               "translate", translate_url,
-                                               "bug", bug_url);
-
+            assert (parent is Gtk.Window);
+            
+            Granite.Widgets.AboutDialog dialog;
+
+            if (parent != null)
+                dialog = parent.get_data ("gtk-about-dialog");
+            else
+                dialog = about_dlg;
+
+            if (dialog == null) {
+                dialog = new Granite.Widgets.AboutDialog ();
+
+                dialog.program_name = program_name;
+                dialog.version = build_version;
+                dialog.logo_icon_name = app_icon;
+
+                dialog.comments = about_comments;
+                dialog.copyright = "%s %s Developers".printf (app_years, program_name);
+                dialog.website = main_url;
+                dialog.website_label = "Website";
+
+                dialog.authors = about_authors;
+                dialog.documenters = about_documenters;
+                dialog.artists = about_artists;
+                dialog.translator_credits = about_translators;
+                dialog.license = about_license;
+                dialog.license_type = about_license_type;
+
+                dialog.help = help_url;
+                dialog.translate = translate_url;
+                dialog.bug = bug_url;
+
+                dialog.delete_event.connect (dialog.hide_on_delete);
+                dialog.response.connect (() => { dialog.hide (); });
+
+                if (parent != null) {
+                    dialog.set_modal (true);
+                    dialog.set_transient_for (parent as Gtk.Window);
+                    dialog.set_destroy_with_parent (true);
+                    parent.set_data_full ("gtk-about-dialog", dialog, Object.unref);
+                } else {
+                    about_dlg = dialog;
+                }
+            }
+
+            dialog.present ();
         }
-
     }
-
 }
 

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2012-11-11 09:34:55 +0000
+++ lib/CMakeLists.txt	2012-11-12 21:25:25 +0000
@@ -104,9 +104,7 @@
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/granite.vapi DESTINATION ${CMAKE_INSTALL_PREFIX}/share/vala/vapi/)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/granite.deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/vala/vapi/)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/granite.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/granite/)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/Widgets/widgets-utils.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/granite/)
 add_library (${PKGNAME} SHARED    
-    Widgets/widgets-utils.c
     Widgets/close-button.c
     ${VALA_C}
 )

=== modified file 'lib/Widgets/AboutDialog.vala'
--- lib/Widgets/AboutDialog.vala	2012-11-08 23:49:23 +0000
+++ lib/Widgets/AboutDialog.vala	2012-11-12 21:25:25 +0000
@@ -193,6 +193,5 @@
             });
         }
     }
-
-    public extern void show_about_dialog (Gtk.Window *parent, ...);
 }
+

=== removed file 'lib/Widgets/widgets-utils.c'
--- lib/Widgets/widgets-utils.c	2011-10-12 12:27:13 +0000
+++ lib/Widgets/widgets-utils.c	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2001 CodeFactory AB
- * Copyright (C) 2001, 2002 Anders Carlsson
- * Copyright (C) 2003, 2004 Matthias Clasen <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Author: Anders Carlsson <[e-mail]>
- *
- * Modified by the GTK+ Team and others 1997-2004.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#include "widgets-utils.h"
-
-static void
-close_cb (GtkWidget *about)
-{
-    GtkAboutDialogPrivate *priv = about->priv;
-
-    gtk_widget_hide (about);
-}
-
-/**
- * gtk_show_about_dialog:
- * @parent: (allow-none): transient parent, or %NULL for none
- * @first_property_name: the name of the first property
- * @Varargs: value of first property, followed by more properties, %NULL-terminated
- *
- * This is a convenience function for showing an application's about box.
- * The constructed dialog is associated with the parent window and
- * reused for future invocations of this function.
- *
- * Since: 2.6
- */
-void
-    granite_widgets_show_about_dialog (GtkWindow   *parent,
-                                       const gchar *first_property_name,
-                                       ...)
-{
-    static GtkWidget *global_about_dialog = NULL;
-    GtkWidget *dialog = NULL;
-    va_list var_args;
-
-    if (parent)
-        dialog = g_object_get_data (G_OBJECT (parent), "gtk-about-dialog");
-    else
-        dialog = global_about_dialog;
-
-    if (!dialog)
-    {
-        //dialog = gtk_about_dialog_new ();
-        dialog = granite_widgets_about_dialog_new ();
-        g_object_ref_sink (dialog);
-
-        g_signal_connect (dialog, "delete-event",
-                          G_CALLBACK (gtk_widget_hide_on_delete), NULL);
-
-        /* Close dialog on user response */
-        g_signal_connect (dialog, "response",
-                          G_CALLBACK (close_cb), NULL);
-
-        va_start (var_args, first_property_name);
-        g_object_set_valist (G_OBJECT (dialog), first_property_name, var_args);
-        va_end (var_args);
-
-        if (parent)
-        {
-            gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-            gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
-            gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
-            g_object_set_data_full (G_OBJECT (parent),
-                                    "gtk-about-dialog",
-                                    dialog, g_object_unref);
-        }
-        else
-            global_about_dialog = dialog;
-
-    }
-
-    gtk_window_present (GTK_WINDOW (dialog));
-}
-
-

=== removed file 'lib/Widgets/widgets-utils.h'
--- lib/Widgets/widgets-utils.h	2011-10-12 12:27:13 +0000
+++ lib/Widgets/widgets-utils.h	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#include <glib.h>
-#include <gtk/gtk.h>
-
-void    granite_widgets_show_about_dialog (GtkWindow   *parent,
-                                           const gchar *first_property_name,
-                                           ...);