[Xfce4-commits] [xfce/xfce4-power-manager] 26/63: trivial: drop old version checks

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit dba7258e43e556ed9bb406f070537967dc17e671
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Mar 15 14:04:38 2015 +0300

    trivial: drop old version checks
    
    Drop old glib and xfce4ui version checks that aren't required
    anymore.
---
 panel-plugins/power-manager-plugin/power-manager-button.c |    4 ----
 settings/xfpm-settings-main.c                             |    5 -----
 settings/xfpm-settings.c                                  |    4 ----
 src/xfpm-main.c                                           |    5 -----
 4 files changed, 18 deletions(-)

diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 2ec3438..d4e11cd 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -1034,11 +1034,7 @@ power_manager_button_free_data_cb (XfcePanelPlugin *plugin, PowerManagerButton *
 static void
 help_cb (GtkMenuItem *menuitem, gpointer user_data)
 {
-#if LIBXFCE4UI_CHECK_VERSION(4, 11, 1)
     xfce_dialog_show_help_with_version (NULL, "xfce4-power-manager", "start", NULL, XFPM_VERSION_SHORT);
-#else
-    xfce_dialog_show_help (NULL, "xfce4-power-manager", "start", NULL);
-#endif
 }
 
 void
diff --git a/settings/xfpm-settings-main.c b/settings/xfpm-settings-main.c
index 57d3669..0bbb6ec 100644
--- a/settings/xfpm-settings-main.c
+++ b/settings/xfpm-settings-main.c
@@ -150,11 +150,6 @@ int main (int argc, char **argv)
 	    return EXIT_FAILURE;
 	}
 
-#if !GLIB_CHECK_VERSION (2, 32, 0)
-    if ( !g_thread_supported () )
-        g_thread_init (NULL);
-#endif
-
 	dbus_g_thread_init ();
 
 	channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index f8ffd27..d7e9457 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -2249,11 +2249,7 @@ static void dialog_response_cb (GtkDialog *dialog, gint response, XfconfChannel
     switch(response)
     {
 	case GTK_RESPONSE_HELP:
-#if LIBXFCE4UI_CHECK_VERSION(4, 11, 1)
 	    xfce_dialog_show_help_with_version (NULL, "xfce4-power-manager", "start", NULL, XFPM_VERSION_SHORT);
-#else
-	    xfce_dialog_show_help (NULL, "xfce4-power-manager", "start", NULL);
-#endif
 	    break;
 	default:
 	    settings_quit (GTK_WIDGET (dialog), channel);
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 04fa5cd..2731e01 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -262,11 +262,6 @@ int main (int argc, char **argv)
 	{ NULL, },
     };
 
-#if !GLIB_CHECK_VERSION (2, 32, 0)
-    if ( !g_thread_supported () )
-        g_thread_init (NULL);
-#endif
-
     /* Parse the options */
     octx = g_option_context_new("");
     g_option_context_set_ignore_unknown_options(octx, TRUE);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.