[Xfce4-commits] <xfdesktop:master> Remove old GLIB/GTK macro checks

Eric Koegel noreply at xfce.org
Sat Dec 14 20:08:01 CET 2013


Updating branch refs/heads/master
         to 1a91076400b8f56126e654ccbd9751acc24974ed (commit)
       from f12aa431c11f4aac2e9805f68e2f1d5b5424e079 (commit)

commit 1a91076400b8f56126e654ccbd9751acc24974ed
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sat Dec 14 21:35:35 2013 +0300

    Remove old GLIB/GTK macro checks
    
    Remove old GLIB/GTK workarounds that were needed in the past. Also
    GSEAL a context action and switch from GtkObject to GtkWidget as
    GtkObject will be gone in the future.

 src/windowlist.c                  |    2 +-
 src/xfdesktop-app-menu-item.c     |   19 +------------------
 src/xfdesktop-clipboard-manager.c |    4 ++--
 src/xfdesktop-file-icon-manager.c |    5 +----
 src/xfdesktop-icon-view.c         |    2 +-
 src/xfdesktop-regular-file-icon.c |    5 +----
 src/xfdesktop-special-file-icon.c |    5 +----
 src/xfdesktop-volume-icon.c       |    6 +-----
 8 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/src/windowlist.c b/src/windowlist.c
index fd04573..09292e1 100644
--- a/src/windowlist.c
+++ b/src/windowlist.c
@@ -123,7 +123,7 @@ window_destroyed_cb(gpointer data, GObject *where_the_object_was)
 }
 
 static void
-mi_destroyed_cb(GtkObject *object, gpointer user_data)
+mi_destroyed_cb(GtkWidget *object, gpointer user_data)
 {
     g_object_weak_unref(G_OBJECT(user_data),
             (GWeakNotify)window_destroyed_cb, object);
diff --git a/src/xfdesktop-app-menu-item.c b/src/xfdesktop-app-menu-item.c
index f565c21..8485f4c 100644
--- a/src/xfdesktop-app-menu-item.c
+++ b/src/xfdesktop-app-menu-item.c
@@ -45,7 +45,7 @@ struct _XfdesktopAppMenuItem
 
 typedef struct _XfdesktopAppMenuItemClass
 {
-	GtkImageMenuItemClass parent;
+    GtkImageMenuItemClass parent;
 } XfdesktopAppMenuItemClass;
 
 enum
@@ -228,9 +228,6 @@ static void
 xfdesktop_app_menu_item_changed(XfdesktopAppMenuItem *app_menu_item)
 {
     const gchar *label;
-#if !GTK_CHECK_VERSION (2, 16, 0)
-    GtkWidget   *child;
-#endif
 
     g_return_if_fail(XFCE_IS_APP_MENU_ITEM(app_menu_item));
     g_return_if_fail(GARCON_IS_MENU_ITEM(app_menu_item->item));
@@ -242,21 +239,7 @@ xfdesktop_app_menu_item_changed(XfdesktopAppMenuItem *app_menu_item)
     if (G_UNLIKELY (label == NULL))
       label = "";
 
-#if GTK_CHECK_VERSION(2, 16, 0)
     gtk_menu_item_set_label(GTK_MENU_ITEM(app_menu_item), label);
-#else
-    child = gtk_bin_get_child(GTK_BIN (app_menu_item));
-    if (child == NULL) {
-        child = gtk_accel_label_new(label);
-        gtk_container_add(GTK_CONTAINER(app_menu_item), child);
-        gtk_misc_set_alignment(GTK_MISC(child), 0.0, 0.5);
-        gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(child), GTK_WIDGET(app_menu_item));
-        gtk_widget_show(child);
-    } else {
-        g_return_if_fail(GTK_IS_LABEL(child));
-        gtk_label_set_text(GTK_LABEL(child), label);
-    }
-#endif
 }
 
 static void
diff --git a/src/xfdesktop-clipboard-manager.c b/src/xfdesktop-clipboard-manager.c
index 75a07cf..a02dacc 100644
--- a/src/xfdesktop-clipboard-manager.c
+++ b/src/xfdesktop-clipboard-manager.c
@@ -78,11 +78,11 @@ static void xfdesktop_clipboard_manager_file_destroyed    (XfdesktopClipboardMan
 static void xfdesktop_clipboard_manager_owner_changed     (GtkClipboard                   *clipboard,
                                                            GdkEventOwnerChange            *event,
                                                            XfdesktopClipboardManager      *manager);
-#if 0
+
 static void xfdesktop_clipboard_manager_contents_received (GtkClipboard                   *clipboard,
                                                            GtkSelectionData               *selection_data,
                                                            gpointer                        user_data);
-#endif
+
 static void xfdesktop_clipboard_manager_targets_received  (GtkClipboard                   *clipboard,
                                                            GtkSelectionData               *selection_data,
                                                            gpointer                        user_data);
diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index 239d064..f473701 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -2739,11 +2739,8 @@ xfdesktop_file_icon_manager_files_ready(GFileEnumerator *enumerator,
     if(!files) {
         if(error) {
             GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(fmanager->priv->icon_view));
-#if GTK_CHECK_VERSION (2, 18, 0)
+
             xfce_message_dialog(gtk_widget_is_toplevel(toplevel) ? GTK_WINDOW(toplevel) : NULL,
-#else
-            xfce_message_dialog(GTK_WIDGET_TOPLEVEL(toplevel) ? GTK_WINDOW(toplevel) : NULL,
-#endif
                                 _("Load Error"),
                                 GTK_STOCK_DIALOG_WARNING, 
                                 _("Failed to load the desktop folder"), error->message,
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index f28e36a..595d25e 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -1536,7 +1536,7 @@ xfdesktop_icon_view_drag_motion(GtkWidget *widget,
             our_action = gdk_drag_context_get_suggested_action(context);
     } else {
         /* start with all available actions (may be filtered by modifier keys) */
-        GdkDragAction allowed_actions = context->actions;
+        GdkDragAction allowed_actions = gdk_drag_context_get_actions(context);
 
         if(is_local_drag) {  /* #2 */
             /* check to make sure we aren't just hovering over ourself */
diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c
index 44c7b75..8e25226 100644
--- a/src/xfdesktop-regular-file-icon.c
+++ b/src/xfdesktop-regular-file-icon.c
@@ -592,11 +592,8 @@ xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon)
 
         size = g_file_info_get_attribute_uint64(info,
                                                 G_FILE_ATTRIBUTE_STANDARD_SIZE);
-#if GLIB_CHECK_VERSION (2, 30, 0)
+
         size_string = g_format_size(size);
-#else
-        size_string = g_format_size_for_display(size);
-#endif
 
         mtime = g_file_info_get_attribute_uint64(info,
                                                  G_FILE_ATTRIBUTE_TIME_MODIFIED);
diff --git a/src/xfdesktop-special-file-icon.c b/src/xfdesktop-special-file-icon.c
index a167ca8..a6ae54a 100644
--- a/src/xfdesktop-special-file-icon.c
+++ b/src/xfdesktop-special-file-icon.c
@@ -484,11 +484,8 @@ xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon *icon)
 
             size = g_file_info_get_attribute_uint64(info,
                                                     G_FILE_ATTRIBUTE_STANDARD_SIZE);
-#if GLIB_CHECK_VERSION (2, 30, 0)
+
             size_string = g_format_size(size);
-#else
-            size_string = g_format_size_for_display(size);
-#endif
 
             mtime = g_file_info_get_attribute_uint64(info,
                                                      G_FILE_ATTRIBUTE_TIME_MODIFIED);
diff --git a/src/xfdesktop-volume-icon.c b/src/xfdesktop-volume-icon.c
index a8427f1..66a0b36 100644
--- a/src/xfdesktop-volume-icon.c
+++ b/src/xfdesktop-volume-icon.c
@@ -474,13 +474,9 @@ xfdesktop_volume_icon_peek_tooltip(XfdesktopIcon *icon)
                                                     G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
             free_space = g_file_info_get_attribute_uint64(fs_info,
                                                           G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
-#if GLIB_CHECK_VERSION (2, 30, 0)
+
             size_string = g_format_size(size);
             free_space_string = g_format_size(free_space);
-#else
-            size_string = g_format_size_for_display(size);
-            free_space_string = g_format_size_for_display(free_space);
-#endif
 
             volume_icon->priv->tooltip =
                 g_strdup_printf(_("Removable Volume\nMounted in \"%s\"\n%s left (%s total)"),


More information about the Xfce4-commits mailing list