Merge pull request #26 from monsta/laundry

drop support for win32

6 files changed, 3 insertions, 168 deletions

diff --git a/configure.ac b/configure.ac
index 44979bf..cbcc20a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,17 +20,6 @@ LT_VERSION=7:9:6
 AC_SUBST(LT_VERSION)
 
 AC_CANONICAL_HOST
-AC_MSG_CHECKING([for Win32])
-case "$host" in
-  *-*-mingw*)
-    mateweather_native_win32="yes"
-    ;;
-  *)
-    mateweather_native_win32="no"
-    ;;
-esac
-AC_MSG_RESULT([$mateweather_native_win32])
-AM_CONDITIONAL(OS_WIN32, [test "$mateweather_native_win32" = "yes"])
 
 AC_MSG_CHECKING([which gtk+ version to compile against])
 AC_ARG_WITH([gtk],
@@ -58,7 +47,7 @@ GIO_REQUIRED=2.25.0
 LIBXML_REQUIRED=2.6.0
 
 LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll disable-static])
+LT_INIT([dlopen disable-static])
 LT_LIB_M
 
 IT_PROG_INTLTOOL([0.40.6])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1e02b60..faa7286 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -48,7 +48,7 @@ CFILE_GLOB=$(top_srcdir)/libmateweather/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=mateweather-enum-types.h mateweather-win32.h parser.h weather-priv.h
+IGNORE_HFILES=mateweather-enum-types.h parser.h weather-priv.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/libmateweather/Makefile.am b/libmateweather/Makefile.am
index b626bcf..b97a4f7 100644
--- a/libmateweather/Makefile.am
+++ b/libmateweather/Makefile.am
@@ -20,7 +20,7 @@ libmateweatherinc_HEADERS = \
 	$(mateweather_new_headers)		\
 	mateweather-enum-types.h
 
-noinst_HEADERS = weather-priv.h mateweather-win32.h
+noinst_HEADERS = weather-priv.h
 
 libmateweather_la_SOURCES = \
 	weather.c weather.h weather-priv.h \
@@ -32,17 +32,10 @@ libmateweather_la_SOURCES = \
 	mateweather-xml.c mateweather-xml.h \
 	mateweather-location.c mateweather-location.h \
 	mateweather-timezone.c mateweather-timezone.h \
-	mateweather-win32.h \
 	location-entry.c location-entry.h \
 	timezone-menu.c timezone-menu.h \
 	parser.c parser.h
 
-if OS_WIN32
-libmateweather_la_SOURCES += mateweather-win32.c
-else
-EXTRA_libmateweather_la_SOURCES = mateweather-win32.c
-endif
-
 libmateweather_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)			\
 	$(LIBXML_CFLAGS)		\
diff --git a/libmateweather/mateweather-win32.c b/libmateweather/mateweather-win32.c
deleted file mode 100644
index 1d3e197..0000000
--- a/libmateweather/mateweather-win32.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* mateweather-win32.c - Win32 portability
- *
- * Copyright 2008, Novell, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-
-#ifdef G_OS_WIN32
-
-#include <windows.h>
-
-#include "mateweather-win32.h"
-
-static HMODULE dll = NULL;
-
-/* Prototype first to silence gcc warning */
-BOOL WINAPI
-DllMain (HINSTANCE hinstDLL,
-	 DWORD     fdwReason,
-	 LPVOID    lpvReserved);
-
-BOOL WINAPI
-DllMain (HINSTANCE hinstDLL,
-	 DWORD     fdwReason,
-	 LPVOID    lpvReserved)
-{
-  if (fdwReason == DLL_PROCESS_ATTACH)
-      dll = hinstDLL;
-
-  return TRUE;
-}
-
-char *
-_mateweather_win32_get_zoneinfo_dir (void)
-{
-    static char *retval = NULL;
-    char *root;
-
-    if (retval)
-	return retval;
-
-    root = g_win32_get_package_installation_directory_of_module (dll);
-    retval = g_build_filename (root, "share/zoneinfo", NULL);
-    g_free (root);
-
-    return retval;
-}
-
-char *
-_mateweather_win32_get_locale_dir (void)
-{
-    static char *retval = NULL;
-    char *root;
-
-    if (retval)
-	return retval;
-
-    root = g_win32_get_package_installation_directory_of_module (dll);
-    retval = g_build_filename (root, "share/locale", NULL);
-    g_free (root);
-
-    return retval;
-}
-
-char *
-_mateweather_win32_get_xml_location_dir (void)
-{
-    static char *retval = NULL;
-    char *root;
-
-    if (retval)
-	return retval;
-
-    root = g_win32_get_package_installation_directory_of_module (dll);
-    retval = g_build_filename (root, "share/libmateweather", NULL);
-    g_free (root);
-
-    return retval;
-}
-
-#endif
diff --git a/libmateweather/mateweather-win32.h b/libmateweather/mateweather-win32.h
deleted file mode 100644
index 184ac4f..0000000
--- a/libmateweather/mateweather-win32.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* mateweather-win32.h - Win32 portability
- *
- * Copyright 2008, Novell, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __MATEWEATHER_WIN32_H__
-#define __MATEWEATHER_WIN32_H__
-
-#ifdef _WIN32
-
-#define localtime_r(t,tmp) (localtime (t) ? ((*tmp) = *localtime (t), tmp) : NULL)
-
-#undef MATELOCALEDIR
-#define MATELOCALEDIR _mateweather_win32_get_locale_dir ()
-
-#undef ZONEINFO_DIR
-#define ZONEINFO_DIR _mateweather_win32_get_zoneinfo_dir ()
-
-#undef MATEWEATHER_XML_LOCATION_DIR
-#define MATEWEATHER_XML_LOCATION_DIR _mateweather_win32_get_xml_location_dir ()
-
-char *_mateweather_win32_get_locale_dir (void);
-char *_mateweather_win32_get_zoneinfo_dir (void);
-char *_mateweather_win32_get_xml_location_dir (void);
-
-#endif
-
-#endif /* __MATEWEATHER_WIN32_H__ */
diff --git a/libmateweather/weather-priv.h b/libmateweather/weather-priv.h
index e602f7b..c0c0944 100644
--- a/libmateweather/weather-priv.h
+++ b/libmateweather/weather-priv.h
@@ -29,10 +29,6 @@
 #include "weather.h"
 #include "mateweather-location.h"
 
-#ifdef _WIN32
-#include "mateweather-win32.h"
-#endif
-
 const char *mateweather_gettext (const char *str) G_GNUC_FORMAT (1);
 const char *mateweather_dpgettext (const char *context, const char *str) G_GNUC_FORMAT (2);
 #define _(str) (mateweather_gettext (str))