FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove GLIB_CHECK_VERSION checks

Browse Source 
The minimal gtk version is 3.22, which implies glib is at least 2.50.0.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
This commit is contained in:
Olaf Hering
2021-01-30 19:39:10 +01:00
committed by Simon Steinbeiß
parent d9c7ae22b9
commit c5621ec523
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.c
View File

@@ -14,9 +14,7 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#if GLIB_CHECK_VERSION(2, 28, 0)
#include <gio/gio.h> #include <gio/gio.h>
#endif
#include <xfconf/xfconf.h> #include <xfconf/xfconf.h>
#include <libxfce4ui/libxfce4ui.h> #include <libxfce4ui/libxfce4ui.h>
@@ -198,11 +196,9 @@ refresh_rate_changed (void)
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
XfconfChannel *channel; XfconfChannel *channel;
#if GLIB_CHECK_VERSION(2, 28, 0)
GApplication *app; GApplication *app;
GError *error = NULL; GError *error = NULL;
GOptionContext *opt_context; GOptionContext *opt_context;
#endif
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -212,7 +208,6 @@ int main (int argc, char *argv[])
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
g_set_application_name (_("Task Manager")); g_set_application_name (_("Task Manager"));
#if GLIB_CHECK_VERSION(2, 28, 0)
opt_context = g_option_context_new (""); opt_context = g_option_context_new ("");
g_option_context_add_main_entries (opt_context, main_entries, NULL); g_option_context_add_main_entries (opt_context, main_entries, NULL);
g_option_context_add_group (opt_context, gtk_get_option_group (TRUE)); g_option_context_add_group (opt_context, gtk_get_option_group (TRUE));
@@ -238,7 +233,6 @@ int main (int argc, char *argv[])
g_object_unref (app); g_object_unref (app);
return 0; return 0;
} }
#endif
if (!xfconf_init (&error)) if (!xfconf_init (&error))
{ {
@@ -261,9 +255,7 @@ int main (int argc, char *argv[])
if (!start_hidden) if (!start_hidden)
gtk_widget_show (window); gtk_widget_show (window);
#if GLIB_CHECK_VERSION(2, 28, 0)
g_signal_connect_swapped (app, "activate", G_CALLBACK (xtm_process_window_show), window); g_signal_connect_swapped (app, "activate", G_CALLBACK (xtm_process_window_show), window);
#endif
task_manager = xtm_task_manager_new (xtm_process_window_get_model (XTM_PROCESS_WINDOW (window))); task_manager = xtm_task_manager_new (xtm_process_window_get_model (XTM_PROCESS_WINDOW (window)));