[Xfce4-commits] <xfdesktop:master> Remove checks for older GLib/GTK+ versions that are no longer needed.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to d375b9b45721d9fb48f02d0f6764c0d811319293 (commit)
       from 5772901126a8e820c4a846d6c7385c9cc0364637 (commit)

commit d375b9b45721d9fb48f02d0f6764c0d811319293
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Nov 14 13:09:57 2010 +0100

    Remove checks for older GLib/GTK+ versions that are no longer needed.

 settings/main.c                   |    4 ----
 src/xfdesktop-clipboard-manager.c |    2 --
 src/xfdesktop-file-icon-manager.c |    3 +--
 src/xfdesktop-icon-view.c         |    6 ------
 4 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index 06edc9b..ee5d464 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -1241,7 +1241,6 @@ xfdesktop_settings_dialog_new(GtkBuilder *main_gxml,
             panel->monitor = j;
 
             if(nscreens > 1 && nmonitors > 1) {
-#if GTK_CHECK_VERSION(2, 13, 0)
                 gchar *monitor_name = gdk_screen_get_monitor_plug_name(screen,
                                                                        j);
                 if(monitor_name) {
@@ -1250,13 +1249,11 @@ xfdesktop_settings_dialog_new(GtkBuilder *main_gxml,
                                monitor_name);
                     g_free(monitor_name);
                 } else
-#endif
                     g_snprintf(buf, sizeof(buf), _("Screen %d, Monitor %d"),
                                i+1, j+1);
             } else if(nscreens > 1)
                 g_snprintf(buf, sizeof(buf), _("Screen %d"), i+1);
             else {
-#if GTK_CHECK_VERSION(2, 13, 0)
                 gchar *monitor_name = gdk_screen_get_monitor_plug_name(screen,
                                                                        j);
                 if(monitor_name) {
@@ -1264,7 +1261,6 @@ xfdesktop_settings_dialog_new(GtkBuilder *main_gxml,
                                j+1, monitor_name);
                     g_free(monitor_name);
                 } else
-#endif
                     g_snprintf(buf, sizeof(buf), _("Monitor %d"), j+1);
             }
 
diff --git a/src/xfdesktop-clipboard-manager.c b/src/xfdesktop-clipboard-manager.c
index a006864..76b4bef 100644
--- a/src/xfdesktop-clipboard-manager.c
+++ b/src/xfdesktop-clipboard-manager.c
@@ -537,9 +537,7 @@ xfdesktop_clipboard_manager_transfer_files (XfdesktopClipboardManager *manager,
                                 G_OBJECT (manager));
 
   /* Need to fake a "owner-change" event here if the Xserver doesn't support clipboard notification */
-#if GTK_CHECK_VERSION(2,6,0)
   if (!gdk_display_supports_selection_notification (gtk_clipboard_get_display (manager->clipboard)))
-#endif
     {
       xfdesktop_clipboard_manager_owner_changed (manager->clipboard, NULL, manager);
     }
diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index a75f413..74f4a3d 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -416,7 +416,6 @@ __migrate_old_icon_positions(XfdesktopFileIconManager *fmanager)
                 GError *error = NULL;
                 
                 if(g_file_get_contents(old_file, &contents, &length, &error)) {
-#if GLIB_CHECK_VERSION(2, 8, 0)
                     if(!g_file_set_contents(new_file, contents, length,
                                             &error))
                     {
@@ -424,7 +423,7 @@ __migrate_old_icon_positions(XfdesktopFileIconManager *fmanager)
                                    error->message);
                         g_error_free(error);
                     }
-#else
+
                     FILE *fp = fopen(new_file, "w");
                     gboolean success = FALSE;
                     if(fp) {
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index db36a74..7596c10 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -313,14 +313,12 @@ static gboolean xfdesktop_icon_view_icon_find_position(XfdesktopIconView *icon_v
 static gboolean xfdesktop_icon_view_shift_area_to_cell(XfdesktopIconView *icon_view,
                                                        XfdesktopIcon *icon,
                                                        GdkRectangle *text_area);
-#if GTK_CHECK_VERSION(2, 12, 0)
 static gboolean xfdesktop_icon_view_show_tooltip(GtkWidget *widget,
                                                  gint x,
                                                  gint y,
                                                  gboolean keyboard_tooltip,
                                                  GtkTooltip *tooltip,
                                                  gpointer user_data);
-#endif
 
 static void xfdesktop_icon_view_real_select_all(XfdesktopIconView *icon_view);
 static void xfdesktop_icon_view_real_unselect_all(XfdesktopIconView *icon_view);
@@ -641,11 +639,9 @@ xfdesktop_icon_view_init(XfdesktopIconView *icon_view)
                                                         icon_view_n_targets);
     gtk_drag_dest_set(GTK_WIDGET(icon_view), 0, NULL, 0, GDK_ACTION_MOVE);
     
-#if GTK_CHECK_VERSION(2, 12, 0)
     g_object_set(G_OBJECT(icon_view), "has-tooltip", TRUE, NULL);
     g_signal_connect(G_OBJECT(icon_view), "query-tooltip",
                      G_CALLBACK(xfdesktop_icon_view_show_tooltip), NULL);
-#endif
     
     GTK_WIDGET_SET_FLAGS(GTK_WIDGET(icon_view), GTK_NO_WINDOW);
 }
@@ -931,7 +927,6 @@ xfdesktop_icon_view_maybe_begin_drag(XfdesktopIconView *icon_view,
     return TRUE;
 }
 
-#if GTK_CHECK_VERSION(2, 12, 0)
 static gboolean
 xfdesktop_icon_view_show_tooltip(GtkWidget *widget,
                                  gint x,
@@ -957,7 +952,6 @@ xfdesktop_icon_view_show_tooltip(GtkWidget *widget,
 
     return TRUE;
 }
-#endif
 
 static gboolean
 xfdesktop_icon_view_motion_notify(GtkWidget *widget,