[gtk/wip/chergert/quartz4u] ignore documents portal for macos
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/chergert/quartz4u] ignore documents portal for macos
- Date: Tue, 28 Apr 2020 23:22:29 +0000 (UTC)
commit b4c44b9002823493fc1050ad4f3269238788ff12
Author: Christian Hergert <chergert redhat com>
Date: Tue Apr 28 16:21:44 2020 -0700
ignore documents portal for macos
gdk/gdkcontentdeserializer.c | 12 ++++++------
gdk/gdkcontentserializer.c | 18 +++++++++---------
2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gdk/gdkcontentdeserializer.c b/gdk/gdkcontentdeserializer.c
index 12594b1fd8..3846da9745 100644
--- a/gdk/gdkcontentdeserializer.c
+++ b/gdk/gdkcontentdeserializer.c
@@ -41,7 +41,7 @@
typedef struct _Deserializer Deserializer;
-struct _Deserializer
+struct _Deserializer
{
const char * mime_type; /* interned */
GType type;
@@ -424,7 +424,7 @@ lookup_deserializer (const char *mime_type,
deserializer->type == type)
return deserializer;
}
-
+
return NULL;
}
@@ -835,8 +835,8 @@ init (void)
for (f = formats; f; f = f->next)
{
GdkPixbufFormat *fmt = f->data;
- gchar *name;
-
+ gchar *name;
+
name = gdk_pixbuf_format_get_name (fmt);
if (g_str_equal (name, "png"))
{
@@ -849,7 +849,7 @@ init (void)
}
g_free (name);
- }
+ }
for (f = formats; f; f = f->next)
{
@@ -875,7 +875,7 @@ init (void)
g_slist_free (formats);
-#ifdef G_OS_UNIX
+#if defined(G_OS_UNIX) && !defined(__APPLE__)
file_transfer_portal_register ();
#endif
diff --git a/gdk/gdkcontentserializer.c b/gdk/gdkcontentserializer.c
index 63d1232167..ce7af1cb3f 100644
--- a/gdk/gdkcontentserializer.c
+++ b/gdk/gdkcontentserializer.c
@@ -43,7 +43,7 @@
typedef struct _Serializer Serializer;
-struct _Serializer
+struct _Serializer
{
const char * mime_type; /* interned */
GType type;
@@ -427,7 +427,7 @@ lookup_serializer (const char *mime_type,
serializer->type == type)
return serializer;
}
-
+
return NULL;
}
@@ -606,7 +606,7 @@ pixbuf_serializer (GdkContentSerializer *serializer)
const GValue *value;
GdkPixbuf *pixbuf;
const char *name;
-
+
name = gdk_content_serializer_get_user_data (serializer);
value = gdk_content_serializer_get_value (serializer);
@@ -732,7 +732,7 @@ file_uri_serializer (GdkContentSerializer *serializer)
else if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST))
{
GSList *l;
-
+
for (l = g_value_get_boxed (value); l; l = l->next)
{
uri = g_file_get_uri (l->data);
@@ -776,7 +776,7 @@ file_text_serializer (GdkContentSerializer *serializer)
{
GString *str;
GSList *l;
-
+
str = g_string_new (NULL);
for (l = g_value_get_boxed (value); l; l = l->next)
@@ -864,8 +864,8 @@ init (void)
for (f = formats; f; f = f->next)
{
GdkPixbufFormat *fmt = f->data;
- gchar *name;
-
+ gchar *name;
+
name = gdk_pixbuf_format_get_name (fmt);
if (g_str_equal (name, "png"))
{
@@ -878,7 +878,7 @@ init (void)
}
g_free (name);
- }
+ }
for (f = formats; f; f = f->next)
{
@@ -907,7 +907,7 @@ init (void)
g_slist_free (formats);
-#ifdef G_OS_UNIX
+#if defined(G_OS_UNIX) && !defined(__APPLE__)
file_transfer_portal_register ();
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]