diff options
| author | monsta <[email protected]> | 2016-11-20 22:15:39 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-20 22:15:39 +0300 |
| commit | cdf431991d5a5253a99fffb3166965c4e84fb143 (patch) | |
| tree | 05f32a431de6daf231808842f1c80d8b618cd980 /mate-about | |
| parent | 8a02c826552076be5f85bc9412252d096d4f01bb (diff) | |
| download | mate-desktop-cdf431991d5a5253a99fffb3166965c4e84fb143.tar.bz2 mate-desktop-cdf431991d5a5253a99fffb3166965c4e84fb143.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'mate-about')
| -rw-r--r-- | mate-about/mate-about.c | 34 | ||||
| -rw-r--r-- | mate-about/mate-about.h | 8 |
2 files changed, 0 insertions, 42 deletions
diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c index 224f341..0dc8f59 100644 --- a/mate-about/mate-about.c +++ b/mate-about/mate-about.c @@ -29,8 +29,6 @@ textdomain(package); #endif -#if GTK_CHECK_VERSION(3, 0, 0) - static void mate_about_on_activate(GtkApplication* app) { GList* list; @@ -48,23 +46,6 @@ static void mate_about_on_activate(GtkApplication* app) } } -#else - -// callback -static void mate_about_on_activate(GApplication* app) -{ - if (!mate_about_dialog) - { - mate_about_run(); - } - else - { - gtk_window_present(GTK_WINDOW(mate_about_dialog)); - } -} - -#endif - void mate_about_run(void) { mate_about_dialog = (MateAboutDialog*) mate_about_dialog_new(); @@ -95,9 +76,7 @@ void mate_about_run(void) * displayed in the about box to give credit to the translator(s). */ mate_about_dialog_set_translator_credits(mate_about_dialog, _("translator-credits")); -#if GTK_CHECK_VERSION(3, 0, 0) gtk_window_set_application(GTK_WINDOW(mate_about_dialog), mate_about_application); -#endif // start and destroy gtk_dialog_run((GtkDialog*) mate_about_dialog); @@ -110,14 +89,10 @@ int main(int argc, char** argv) mate_gettext(GETTEXT_PACKAGE, LOCALE_DIR, "UTF-8"); - /* http://www.gtk.org/api/2.6/glib/glib-Commandline-option-parser.html */ GOptionContext* context = g_option_context_new(NULL); g_option_context_add_main_entries(context, command_entries, GETTEXT_PACKAGE); g_option_context_add_group(context, gtk_get_option_group(TRUE)); g_option_context_parse(context, &argc, &argv, NULL); - - /* Not necesary at all, program just run and die. - * But it free a little memory. */ g_option_context_free(context); if (mate_about_nogui == TRUE) @@ -128,21 +103,12 @@ int main(int argc, char** argv) { gtk_init(&argc, &argv); -#if GTK_CHECK_VERSION(3, 0, 0) mate_about_application = gtk_application_new("org.mate.about", 0); g_signal_connect(mate_about_application, "activate", G_CALLBACK(mate_about_on_activate), NULL); status = g_application_run(G_APPLICATION(mate_about_application), argc, argv); g_object_unref(mate_about_application); -#else - mate_about_application = g_application_new("org.mate.about", G_APPLICATION_FLAGS_NONE); - g_signal_connect(mate_about_application, "activate", G_CALLBACK(mate_about_on_activate), NULL); - - status = g_application_run(G_APPLICATION(mate_about_application), argc, argv); - - g_object_unref(mate_about_application); -#endif } return status; diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h index 7fb903d..32019ae 100644 --- a/mate-about/mate-about.h +++ b/mate-about/mate-about.h @@ -651,11 +651,7 @@ const char* artists[] = { // widget for mate-about window MateAboutDialog* mate_about_dialog = FALSE; -#if GTK_CHECK_VERSION(3, 0, 0) GtkApplication* mate_about_application; -#else -GApplication* mate_about_application; -#endif /** * If this value is set to TRUE, then mate_about_dialog will not be called @@ -666,11 +662,7 @@ gboolean mate_about_nogui = FALSE; void mate_about_run(void); void mate_about_release_version(void); -#if GTK_CHECK_VERSION(3, 0, 0) static void mate_about_on_activate(GtkApplication* app); -#else -static void mate_about_on_activate(GApplication* app); -#endif // arguments definitions static GOptionEntry command_entries[] = { |