summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-04-23 22:02:11 +0200
committerStefano Karapetsas <[email protected]>2014-04-23 22:02:11 +0200
commit3e894dbd0538d1433a0a3be22c7a0388ad9fb8d9 (patch)
tree4dad59c4dbc9dc61b356d19b629dc875619bcd46
parent018dc694f53f4d87337212cc46fd719ecbc6967e (diff)
downloadmate-desktop-3e894dbd0538d1433a0a3be22c7a0388ad9fb8d9.tar.bz2
mate-desktop-3e894dbd0538d1433a0a3be22c7a0388ad9fb8d9.tar.xz
mate-about: Use MateAboutDialog
-rw-r--r--mate-about/Makefile.am2
-rw-r--r--mate-about/mate-about.c33
-rw-r--r--mate-about/mate-about.h4
3 files changed, 16 insertions, 23 deletions
diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am
index 51cbdb4..be825d8 100644
--- a/mate-about/Makefile.am
+++ b/mate-about/Makefile.am
@@ -1,7 +1,7 @@
bin_PROGRAMS = mate-about
mate_about_SOURCES = mate-about.c mate-about.h
mate_about_CFLAGS = $(MATE_ABOUT_CFLAGS) $(UNIQUE_CFLAGS)
-mate_about_LDADD = $(MATE_ABOUT_LIBS) $(UNIQUE_LIBS)
+mate_about_LDADD = $(MATE_ABOUT_LIBS) $(UNIQUE_LIBS) $(top_builddir)/libmate-desktop/libmate-desktop-2.la
AM_CPPFLAGS = \
-I$(top_srcdir) \
diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c
index fa25be6..189e1c7 100644
--- a/mate-about/mate-about.c
+++ b/mate-about/mate-about.c
@@ -70,7 +70,7 @@
void mate_about_run(void)
{
- mate_about_dialog = (GtkAboutDialog*) gtk_about_dialog_new();
+ mate_about_dialog = (MateAboutDialog*) mate_about_dialog_new();
gtk_window_set_default_icon_name(desktop_icon);
@@ -78,44 +78,35 @@
if (gtk_icon_theme_has_icon(icon_theme, icon))
{
- gtk_about_dialog_set_logo_icon_name(mate_about_dialog, icon);
+ mate_about_dialog_set_logo_icon_name(mate_about_dialog, icon);
}
else
{
- gtk_about_dialog_set_logo_icon_name(mate_about_dialog, desktop_icon);
+ mate_about_dialog_set_logo_icon_name(mate_about_dialog, desktop_icon);
}
// name
- #if GTK_CHECK_VERSION(3, 0, 0) || GTK_CHECK_VERSION(2, 12, 0)
- gtk_about_dialog_set_program_name(mate_about_dialog, gettext(program_name));
- #else
- gtk_about_dialog_set_name(mate_about_dialog, gettext(program_name));
- #endif
+ mate_about_dialog_set_program_name(mate_about_dialog, gettext(program_name));
// version
- gtk_about_dialog_set_version(mate_about_dialog, version);
+ mate_about_dialog_set_version(mate_about_dialog, version);
// credits and website
- gtk_about_dialog_set_copyright(mate_about_dialog, copyright);
- gtk_about_dialog_set_website(mate_about_dialog, website);
+ mate_about_dialog_set_copyright(mate_about_dialog, copyright);
+ mate_about_dialog_set_website(mate_about_dialog, website);
/**
* This generate a random message.
* The comments index must not be more than comments_count - 1
*/
- gtk_about_dialog_set_comments(mate_about_dialog, gettext(comments_array[g_random_int_range(0, comments_count - 1)]));
+ mate_about_dialog_set_comments(mate_about_dialog, gettext(comments_array[g_random_int_range(0, comments_count - 1)]));
- gtk_about_dialog_set_authors(mate_about_dialog, authors);
- gtk_about_dialog_set_artists(mate_about_dialog, artists);
- gtk_about_dialog_set_documenters(mate_about_dialog, documenters);
+ mate_about_dialog_set_authors(mate_about_dialog, authors);
+ mate_about_dialog_set_artists(mate_about_dialog, artists);
+ mate_about_dialog_set_documenters(mate_about_dialog, documenters);
/* Translators should localize the following string which will be
* displayed in the about box to give credit to the translator(s). */
- gtk_about_dialog_set_translator_credits(mate_about_dialog, _("translator-credits"));
-
- #if GTK_CHECK_VERSION(3, 0, 0)
- gtk_about_dialog_set_license_type(mate_about_dialog, GTK_LICENSE_GPL_3_0);
- gtk_about_dialog_set_wrap_license(mate_about_dialog, TRUE);
- #endif
+ mate_about_dialog_set_translator_credits(mate_about_dialog, _("translator-credits"));
#ifdef USE_UNIQUE
unique_app_watch_window(mate_about_application, (GtkWindow*) mate_about_dialog);
diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h
index 3993f67..6f9c58f 100644
--- a/mate-about/mate-about.h
+++ b/mate-about/mate-about.h
@@ -26,6 +26,8 @@
#include <glib/gi18n.h>
#include <config.h> // autogenerated by ./configure
+#include <libmate-desktop/mate-aboutdialog.h>
+
#ifdef USE_UNIQUE
#include <unique/unique.h>
#endif
@@ -642,7 +644,7 @@
};
// widget for mate-about window
- GtkAboutDialog* mate_about_dialog = FALSE;
+ MateAboutDialog* mate_about_dialog = FALSE;
// libunique thing
#ifdef USE_UNIQUE