From 977ae7778f8ef610604f6ea4360f0041a62a26a8 Mon Sep 17 00:00:00 2001 From: monsta Date: Sat, 24 Dec 2016 15:51:16 +0300 Subject: mate-about: switch to GtkAboutDialog --- mate-about/Makefile.am | 2 +- mate-about/mate-about.c | 22 +++++++++++----------- mate-about/mate-about.h | 4 +--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am index be825d8..51cbdb4 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) $(top_builddir)/libmate-desktop/libmate-desktop-2.la +mate_about_LDADD = $(MATE_ABOUT_LIBS) $(UNIQUE_LIBS) AM_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c index 0dc8f59..37f5acc 100644 --- a/mate-about/mate-about.c +++ b/mate-about/mate-about.c @@ -48,33 +48,33 @@ static void mate_about_on_activate(GtkApplication* app) void mate_about_run(void) { - mate_about_dialog = (MateAboutDialog*) mate_about_dialog_new(); + mate_about_dialog = (GtkAboutDialog*) gtk_about_dialog_new(); gtk_window_set_default_icon_name(icon); - mate_about_dialog_set_logo_icon_name(mate_about_dialog, icon); + gtk_about_dialog_set_logo_icon_name(mate_about_dialog, icon); // name - mate_about_dialog_set_program_name(mate_about_dialog, gettext(program_name)); + gtk_about_dialog_set_program_name(mate_about_dialog, gettext(program_name)); // version - mate_about_dialog_set_version(mate_about_dialog, version); + gtk_about_dialog_set_version(mate_about_dialog, version); // credits and website - mate_about_dialog_set_copyright(mate_about_dialog, copyright); - mate_about_dialog_set_website(mate_about_dialog, website); + gtk_about_dialog_set_copyright(mate_about_dialog, copyright); + gtk_about_dialog_set_website(mate_about_dialog, website); /** * This generate a random message. * The comments index must not be more than 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_comments(mate_about_dialog, gettext(comments_array[g_random_int_range(0, comments_count - 1)])); - 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); + 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); /* Translators should localize the following string which will be * displayed in the about box to give credit to the translator(s). */ - mate_about_dialog_set_translator_credits(mate_about_dialog, _("translator-credits")); + gtk_about_dialog_set_translator_credits(mate_about_dialog, _("translator-credits")); gtk_window_set_application(GTK_WINDOW(mate_about_dialog), mate_about_application); diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h index 229cf92..1f8c4a6 100644 --- a/mate-about/mate-about.h +++ b/mate-about/mate-about.h @@ -26,8 +26,6 @@ #include // for gettext #include -#include - const char* program_name = "MATE Desktop Environment"; const char* version = PACKAGE_VERSION; const char* icon = "mate"; @@ -649,7 +647,7 @@ const char* artists[] = { }; // widget for mate-about window -MateAboutDialog* mate_about_dialog = FALSE; +GtkAboutDialog* mate_about_dialog = FALSE; GtkApplication* mate_about_application; -- cgit v1.2.1