wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Use MateAboutDialog from libmate-desktop

This commit is contained in:
Stefano Karapetsas 2014-04-29 20:45:38 +02:00
parent 5daa5b4fe5
commit 0768242dc4
5 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -296,6 +296,7 @@ PKG_CHECK_MODULES(PLUMA, [
gio-2.0 >= 2.26.0 gio-2.0 >= 2.26.0
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gtksourceview-$GTK_API_VERSION >= 2.9.7 gtksourceview-$GTK_API_VERSION >= 2.9.7
mate-desktop-2.0 >= 1.9.0
]) ])
if test "$os_osx" = "no" && if test "$os_osx" = "no" &&

6
pluma/pluma-commands-help.c
View File

@ -37,6 +37,7 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libmate-desktop/mate-aboutdialog.h>
#include "pluma-commands.h" #include "pluma-commands.h"
#include "pluma-debug.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 2000-2002 Chema Celorio, Paolo Maggi\n"
"Copyright \xc2\xa9 2003-2006 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 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[] = \ static const gchar comments[] = \
N_("pluma is a small and lightweight text editor for the MATE Desktop"); N_("pluma is a small and lightweight text editor for the MATE Desktop");
pluma_debug (DEBUG_COMMANDS); pluma_debug (DEBUG_COMMANDS);
gtk_show_about_dialog(GTK_WINDOW(window), mate_show_about_dialog(GTK_WINDOW(window),
"program-name", "Pluma", "program-name", "Pluma",
"authors", authors, "authors", authors,
"comments", _(comments), "comments", _(comments),

8
pluma/pluma-utils.c
View File

@ -1005,14 +1005,6 @@ pluma_utils_get_current_viewport (GdkScreen *screen,
#endif #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 static gboolean
is_valid_scheme_character (gchar c) is_valid_scheme_character (gchar c)
{ {

4
pluma/pluma-utils.h
View File

@ -124,10 +124,6 @@ void pluma_utils_get_current_viewport (GdkScreen *screen,
gint *x, gint *x,
gint *y); 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_is_valid_uri (const gchar *uri);
gboolean pluma_utils_get_ui_objects (const gchar *filename, gboolean pluma_utils_get_ui_objects (const gchar *filename,

3
pluma/pluma.c
View File

@ -694,9 +694,6 @@ main (int argc, char *argv[])
pluma_debug_message (DEBUG_APP, "Init plugins"); pluma_debug_message (DEBUG_APP, "Init plugins");
engine = pluma_plugins_engine_get_default (); 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 */ /* Initialize session management */
pluma_debug_message (DEBUG_APP, "Init session manager"); pluma_debug_message (DEBUG_APP, "Init session manager");
pluma_session_init (); pluma_session_init ();