diff options
| author | Weijia Wang <8018380-wegank@users.noreply.gitlab.com> | 2022-12-04 10:46:37 +0300 |
|---|---|---|
| committer | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-12-04 10:46:37 +0300 |
| commit | 4d8767e3699c65846ab945ad6802971eb1e72874 (patch) | |
| tree | 6482f0661c4503b0e41257062a31871be3b743b4 /src | |
| parent | b07f58d287d164741d0c61fc035aa3b9d1b5c5ce (diff) | |
Initial macOS support
Diffstat (limited to 'src')
| -rw-r--r-- | src/remmina.c | 2 | ||||
| -rw-r--r-- | src/remmina_file.c | 5 | ||||
| -rw-r--r-- | src/remmina_main.c | 4 | ||||
| -rw-r--r-- | src/remmina_plugin_manager.c | 2 | ||||
| -rw-r--r-- | src/remmina_plugin_native.c | 2 | ||||
| -rw-r--r-- | src/remmina_public.c | 2 |
6 files changed, 13 insertions, 4 deletions
diff --git a/src/remmina.c b/src/remmina.c index 43834b9bd..e91968d71 100644 --- a/src/remmina.c +++ b/src/remmina.c @@ -40,7 +40,7 @@ #endif /* G_LOG_DOMAIN */ #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> -#else +#elif defined(GDK_WINDOWING_WAYLAND) #include <gdk/gdkwayland.h> #endif #include <gio/gio.h> diff --git a/src/remmina_file.c b/src/remmina_file.c index b2b6a3e77..d362c552c 100644 --- a/src/remmina_file.c +++ b/src/remmina_file.c @@ -1111,8 +1111,13 @@ remmina_file_touch(RemminaFile *remminafile) if (errno != ENOENT) REMMINA_DEBUG("stat %s:", remminafile->statefile); } else if (!r) { +#ifdef __APPLE__ + times[0] = st.st_atimespec; + times[1] = st.st_mtimespec; +#else times[0] = st.st_atim; times[1] = st.st_mtim; +#endif if (utimensat(AT_FDCWD, remminafile->statefile, times, 0) < 0) REMMINA_DEBUG("utimensat %s:", remminafile->statefile); return; diff --git a/src/remmina_main.c b/src/remmina_main.c index 1c53cebae..e3295ccbe 100644 --- a/src/remmina_main.c +++ b/src/remmina_main.c @@ -37,7 +37,9 @@ #include "config.h" #include <ctype.h> #include <gio/gio.h> +#ifndef __APPLE__ #include <gio/gdesktopappinfo.h> +#endif #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> #include <gtk/gtk.h> @@ -1043,6 +1045,7 @@ void remmina_main_on_action_application_preferences(GSimpleAction *action, GVari void remmina_main_on_action_application_default(GSimpleAction *action, GVariant *param, gpointer data) { TRACE_CALL(__func__); +#ifndef __APPLE__ g_autoptr(GError) error = NULL; GDesktopAppInfo *desktop_info; GAppInfo *info = NULL; @@ -1064,6 +1067,7 @@ void remmina_main_on_action_application_default(GSimpleAction *action, GVariant g_app_info_get_name(info), supported_mime_types[i]); } +#endif } void remmina_main_on_action_application_quit(GSimpleAction *action, GVariant *param, gpointer data) diff --git a/src/remmina_plugin_manager.c b/src/remmina_plugin_manager.c index 47af6536a..b077a3c36 100644 --- a/src/remmina_plugin_manager.c +++ b/src/remmina_plugin_manager.c @@ -44,7 +44,7 @@ #include <string.h> #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> -#else +#elif defined(GDK_WINDOWING_WAYLAND) #include <gdk/gdkwayland.h> #endif #include "remmina_public.h" diff --git a/src/remmina_plugin_native.c b/src/remmina_plugin_native.c index 6e844fef1..6661ae231 100644 --- a/src/remmina_plugin_native.c +++ b/src/remmina_plugin_native.c @@ -41,7 +41,7 @@ #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> -#else +#elif defined(GDK_WINDOWING_WAYLAND) #include <gdk/gdkwayland.h> #endif diff --git a/src/remmina_public.c b/src/remmina_public.c index e20030dd7..eb86460fb 100644 --- a/src/remmina_public.c +++ b/src/remmina_public.c @@ -55,7 +55,7 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> -#else +#elif defined(GDK_WINDOWING_WAYLAND) #include <gdk/gdkwayland.h> #endif #include "remmina_public.h" |