[libadwaita/msvc] adw-tab-view.c: Cleanup



commit e589c951a783671377d69e19feac5908d55d6e25
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jan 19 15:43:12 2022 +0800

    adw-tab-view.c: Cleanup
    
    Turns out that we don't need the special g_autoptr()-like thing here, we just
    need the pointer ifself...

 src/adw-tab-view.c | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/src/adw-tab-view.c b/src/adw-tab-view.c
index 1da9356a..b81beeba 100644
--- a/src/adw-tab-view.c
+++ b/src/adw-tab-view.c
@@ -14,27 +14,6 @@
 #include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
-/*
- * Define for different compilers on how we deal with
- * g_object_unref()'ing an AdwTabPage * after we return
- * it after allocating it.  For GCC and CLang, use g_autoptr();
- * for Visual Studio, use the MSVC-specific __try/__finally constructs.
- */
-#if defined (__clang__) || defined (__GNUC__)
-# define ADW_TAB_PAGE_BEGIN_AUTOFREE(var) g_autoptr (AdwTabPage) var = NULL;
-# define ADW_TAB_PAGE_END_AUTOFREE(var)
-#elif defined (_MSC_VER)
-# define ADW_TAB_PAGE_BEGIN_AUTOFREE(var) \
-    AdwTabPage *var = NULL; \
-    __try {
-# define ADW_TAB_PAGE_END_AUTOFREE(var) \
-    } __finally { \
-      g_object_unref (var); \
-    }
-#else
-# error Define a way to do RAII for your C compiler
-#endif
-
 /* FIXME replace with groups */
 static GSList *tab_view_list;
 
@@ -979,8 +958,7 @@ create_and_insert_page (AdwTabView *self,
                         int         position,
                         gboolean    pinned)
 {
-  ADW_TAB_PAGE_BEGIN_AUTOFREE (page)
-  page =
+  AdwTabPage *page =
     g_object_new (ADW_TYPE_TAB_PAGE,
                   "child", child,
                   "parent", parent,
@@ -990,8 +968,9 @@ create_and_insert_page (AdwTabView *self,
 
   insert_page (self, page, position);
 
+  g_object_unref (page);
+
   return page;
-  ADW_TAB_PAGE_END_AUTOFREE (page)
 }
 
 static gboolean
@@ -2617,7 +2596,7 @@ AdwTabPage *
 adw_tab_view_get_nth_page (AdwTabView *self,
                            int         position)
 {
-  ADW_TAB_PAGE_BEGIN_AUTOFREE (page)
+  AdwTabPage *page;
 
   g_return_val_if_fail (ADW_IS_TAB_VIEW (self), NULL);
   g_return_val_if_fail (position >= 0, NULL);
@@ -2625,8 +2604,9 @@ adw_tab_view_get_nth_page (AdwTabView *self,
 
   page = g_list_model_get_item (G_LIST_MODEL (self->children), (guint) position);
 
+  g_object_unref (page);
+
   return page;
-  ADW_TAB_PAGE_END_AUTOFREE (page)
 }
 
 /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]