diff options
| author | Stefano Karapetsas <[email protected]> | 2014-04-29 20:45:38 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-04-29 20:45:38 +0200 |
| commit | 0768242dc492e5dd2cb3dd328b9abd0991c0b8e4 (patch) | |
| tree | ba8dd10c26e24f3151c858e0ecb4d89949174842 | |
| parent | 5daa5b4fe500f6526365513131830bd0989ee64d (diff) | |
| download | pluma-0768242dc492e5dd2cb3dd328b9abd0991c0b8e4.tar.bz2 pluma-0768242dc492e5dd2cb3dd328b9abd0991c0b8e4.tar.xz | |
Use MateAboutDialog from libmate-desktop
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | pluma/pluma-commands-help.c | 6 | ||||
| -rw-r--r-- | pluma/pluma-utils.c | 8 | ||||
| -rw-r--r-- | pluma/pluma-utils.h | 4 | ||||
| -rw-r--r-- | pluma/pluma.c | 3 |
5 files changed, 5 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 7af592cd..a3c22053 100644 --- a/configure.ac +++ b/configure.ac @@ -296,6 +296,7 @@ PKG_CHECK_MODULES(PLUMA, [ gio-2.0 >= 2.26.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gtksourceview-$GTK_API_VERSION >= 2.9.7 + mate-desktop-2.0 >= 1.9.0 ]) if test "$os_osx" = "no" && diff --git a/pluma/pluma-commands-help.c b/pluma/pluma-commands-help.c index db56e23b..1b062eff 100644 --- a/pluma/pluma-commands-help.c +++ b/pluma/pluma-commands-help.c @@ -37,6 +37,7 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> +#include <libmate-desktop/mate-aboutdialog.h> #include "pluma-commands.h" #include "pluma-debug.h" @@ -76,14 +77,15 @@ void _pluma_cmd_help_about(GtkAction* action, PlumaWindow* window) "Copyright \xc2\xa9 2000-2002 Chema Celorio, Paolo Maggi\n" "Copyright \xc2\xa9 2003-2006 Paolo Maggi\n" "Copyright \xc2\xa9 2004-2010 Paolo Borelli, Jesse van den Kieboom\nSteve Fr\303\251cinaux, Ignacio Casal Quinteiro\n" - "Copyright \xc2\xa9 2011 Perberos"; + "Copyright \xc2\xa9 2011 Perberos\n" + "Copyright \xc2\xa9 2012-2014 MATE developers"; static const gchar comments[] = \ N_("pluma is a small and lightweight text editor for the MATE Desktop"); pluma_debug (DEBUG_COMMANDS); - gtk_show_about_dialog(GTK_WINDOW(window), + mate_show_about_dialog(GTK_WINDOW(window), "program-name", "Pluma", "authors", authors, "comments", _(comments), diff --git a/pluma/pluma-utils.c b/pluma/pluma-utils.c index bf0a6862..e631eca4 100644 --- a/pluma/pluma-utils.c +++ b/pluma/pluma-utils.c @@ -1005,14 +1005,6 @@ pluma_utils_get_current_viewport (GdkScreen *screen, #endif } -void -pluma_utils_activate_url (GtkAboutDialog *about, - const gchar *url, - gpointer data) -{ - gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (about)), url, GDK_CURRENT_TIME, NULL); -} - static gboolean is_valid_scheme_character (gchar c) { diff --git a/pluma/pluma-utils.h b/pluma/pluma-utils.h index d615a4c8..066bb438 100644 --- a/pluma/pluma-utils.h +++ b/pluma/pluma-utils.h @@ -124,10 +124,6 @@ void pluma_utils_get_current_viewport (GdkScreen *screen, gint *x, gint *y); -void pluma_utils_activate_url (GtkAboutDialog *about, - const gchar *url, - gpointer data); - gboolean pluma_utils_is_valid_uri (const gchar *uri); gboolean pluma_utils_get_ui_objects (const gchar *filename, diff --git a/pluma/pluma.c b/pluma/pluma.c index 7fbe58cb..9166a749 100644 --- a/pluma/pluma.c +++ b/pluma/pluma.c @@ -694,9 +694,6 @@ main (int argc, char *argv[]) pluma_debug_message (DEBUG_APP, "Init plugins"); engine = pluma_plugins_engine_get_default (); - #if !GTK_CHECK_VERSION(3, 0, 0) - gtk_about_dialog_set_url_hook(pluma_utils_activate_url, NULL, NULL); - #endif /* Initialize session management */ pluma_debug_message (DEBUG_APP, "Init session manager"); pluma_session_init (); |