[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Bring back the about dialog (Bug #11982)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit cf6b25d4d26575a33a3fe14d6812f3526294b63c
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Jun 14 22:34:47 2015 +0300

    Bring back the about dialog (Bug #11982)
    
    This brings back the about dialog for the panel plugin and updates
    it for the newer stuff required by GTK3.
---
 common/xfpm-common.c                               |   22 +++++++++++++-------
 common/xfpm-common.h                               |    3 +--
 .../power-manager-plugin/power-manager-button.c    |   12 +++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/common/xfpm-common.c b/common/xfpm-common.c
index a3fead1..fc02e2f 100644
--- a/common/xfpm-common.c
+++ b/common/xfpm-common.c
@@ -105,14 +105,14 @@ xfpm_quit (void)
 }
 
 void       
-xfpm_about (GtkWidget *widget, gpointer data)
+xfpm_about (gpointer data)
 {
     gchar *package = (gchar *)data;
     
-    const gchar* authors[3] = 
+    const gchar* authors[] =
     {
-	"Ali Abdallah <aliov at xfce.org>", 
-	 NULL
+	"Ali Abdallah <aliov at xfce.org>",
+	 NULL,
     };
 							    
     static const gchar *documenters[] =
@@ -121,16 +121,24 @@ xfpm_about (GtkWidget *widget, gpointer data)
 	NULL,
     };
 
+    static const gchar *artists[] =
+    {
+	"Simon Steinbeiß <simon at xfce.org>",
+	 NULL,
+    };
+
     gtk_show_about_dialog (NULL,
-		     "authors", authors,
-		     "copyright", "Copyright \302\251 2008-2011 Ali Abdallah",
+		     "copyright", "Copyright \302\251 2008-2011 Ali Abdallah\nCopyright \302\251 2011-2012 Nick Schermer\nCopyright \302\251 2013-2015 Eric Koegel, Harald Judt, Simon Steinbeiß",
 		     "destroy-with-parent", TRUE,
+		     "authors", authors,
+		     "artists", artists,
 		     "documenters", documenters,
 		     "license", XFCE_LICENSE_GPL,
 		     "program-name", package,
 		     "translator-credits", _("translator-credits"),
 		     "version", PACKAGE_VERSION,
-		     "website", "http://goodies.xfce.org/projects/applications/xfce4-power-manager",
+		     "website", "http://docs.xfce.org/xfce/xfce4-power-manager/1.4/start",
+		     "logo-icon-name", "xfce4-power-manager-settings",
 		     NULL);
 						 
 }
diff --git a/common/xfpm-common.h b/common/xfpm-common.h
index afa3b6f..9f4e080 100644
--- a/common/xfpm-common.h
+++ b/common/xfpm-common.h
@@ -48,8 +48,7 @@ void        xfpm_preferences_device_id (const gchar* object_path);
 
 void            xfpm_quit                       (void);
 
-void       	xfpm_about			(GtkWidget *widget, 
-						 gpointer data);
+void       	xfpm_about			(gpointer data);
 
 gboolean	xfpm_is_multihead_connected	(void);
 
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 936de31..acec909 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -1071,6 +1071,12 @@ help_cb (GtkMenuItem *menuitem, gpointer user_data)
     xfce_dialog_show_help_with_version (NULL, "xfce4-power-manager", "start", NULL, XFPM_VERSION_SHORT);
 }
 
+static void
+about_cb (GtkMenuItem *menuitem, gpointer user_data)
+{
+    xfpm_about ("xfce4-power-manager");
+}
+
 void
 power_manager_button_show (PowerManagerButton *button)
 {
@@ -1098,6 +1104,12 @@ power_manager_button_show (PowerManagerButton *button)
     gtk_widget_show (mi);
     g_signal_connect (mi, "activate", G_CALLBACK (help_cb), button);
 
+    /* about dialog */
+    mi = gtk_menu_item_new_with_mnemonic (_("_About"));
+    gtk_widget_set_sensitive (mi, TRUE);
+    gtk_widget_show (mi);
+    g_signal_connect (mi, "activate", G_CALLBACK (about_cb), button);
+
 #ifdef XFCE_PLUGIN
     xfce_panel_plugin_menu_insert_item (button->priv->plugin, GTK_MENU_ITEM (mi));
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.