Fixet protector definition in gswe-types.h

Solves #1

README.md

@@ -109,3 +109,7 @@ The size of all data files provided by Astrodienst is around 40MB. Although it s
 ### Fixed stars are not known yet
 
 Although Swiss Ephemeris has the functionality to calculate the position of fixed stars, SWE-GLib doesn't provide such functionality. This, however, is a planned feature for the close future.
+
+## Licencing
+
+As the underlying Swiss Ephemeris is published under GPL (or a commercial license I can not afford), SWE-GLib is also uses that. This means that you can currently use SWE-GLib in software published under the GNU GPL v3.

configure.ac

@@ -1,6 +1,6 @@
 m4_define([swe_glib_major_version], [1])
 m4_define([swe_glib_minor_version], [0])
-m4_define([swe_glib_micro_version], [3])
+m4_define([swe_glib_micro_version], [5])
 m4_define([swe_glib_version], [swe_glib_major_version.swe_glib_minor_version.swe_glib_micro_version])
 m4_define([swe_glib_api_version], [swe_glib_major_version.0])
 

src/gswe-enumtypes.c.template

@@ -1,21 +1,20 @@
 /*** BEGIN file-header ***/
 /* gswe-enumtypes.c - Enumeration types for SWE-GLib
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include "gswe-enumtypes.h"
 #include "@filename@"

src/gswe-enumtypes.h.template

@@ -1,21 +1,20 @@
 /*** BEGIN file-header ***/
 /* gswe-enumtypes.h - Enumeration types for SWE-GLib
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #ifndef __GSWE_ENUM_TYPES_H__
 #define __GSWE_ENUM_TYPES_H__

src/gswe-moment.c

@@ -1,20 +1,19 @@
 /* gswe-moment.c - Planetary moment object for SWE-GLib
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include "swe-glib.h"
 #include "gswe-types.h"
@@ -420,7 +419,7 @@ gswe_moment_new(void)
  * @altitude: the altitude part of the coordinates, in meters. As also noted in
  *            the README, it is safe to pass a value of around 400.0, unless
  *            you want to create a *really* precise chart
- * @house_system: the house system you want to use. WARNING! Using GSWE_HOUSE_SYSTEM_NONE is currently a bad idea, the results are unpredicted
+ * @house_system: the house system you want to use
  *
  * Creates a new GsweMoment object with the timestamp, coordinates and house system set. This is the preferred way to create a GsweMoment object.
  *
@@ -439,10 +438,6 @@ gswe_moment_new_full(GsweTimestamp *timestamp, gdouble longitude, gdouble latitu
     moment->priv->coordinates.altitude = altitude;
     moment->priv->house_system = house_system;
 
-    if (house_system == GSWE_HOUSE_SYSTEM_NONE) {
-        g_warning("Using GSWE_HOUSE_SYSTEM_NONE is unsafe. You have been warned!");
-    }
-
     return moment;
 }
 
@@ -478,8 +473,8 @@ gswe_calculate_data_by_position(GsweMoment *moment, GswePlanet planet, gdouble p
 
     // If position happens to be exactly 0, this calculation yields
     // GSWE_SIGN_NONE, but should be GSWE_SIGN_ARIES
-    if (sign == 0) {
+    if (sign == GSWE_SIGN_NONE) {
-        sign = 1;
+        sign = GSWE_SIGN_ARIES;
     }
 
     if ((sign_info = g_hash_table_lookup(gswe_sign_info_table, GINT_TO_POINTER(sign))) == NULL) {
@@ -506,6 +501,17 @@ gswe_moment_calculate_house_positions(GsweMoment *moment, GError **err)
         return;
     }
 
+    g_list_free_full(moment->priv->house_list, g_free);
+    moment->priv->house_list = NULL;
+
+    // If no house system is set, we need no calculations at all. Just leave
+    // the list empty and return
+    if (moment->priv->house_system == GSWE_HOUSE_SYSTEM_NONE) {
+        moment->priv->house_revision = moment->priv->revision;
+
+        return;
+    }
+
     if ((house_system_data = g_hash_table_lookup(gswe_house_system_info_table, GINT_TO_POINTER(moment->priv->house_system))) == NULL) {
         g_set_error(err, GSWE_MOMENT_ERROR, GSWE_MOMENT_ERROR_UNKNOWN_HSYS, "Unknown house system");
 
@@ -514,15 +520,14 @@ gswe_moment_calculate_house_positions(GsweMoment *moment, GError **err)
 
     jd = gswe_timestamp_get_julian_day(moment->priv->timestamp, err);
 
+    // If Julian Day calculation yields error, we don't do anything. err is
+    // already filled with the error message, so let's just return
     if ((err) && (*err)) {
         return;
     }
 
     swe_houses(jd, moment->priv->coordinates.latitude, moment->priv->coordinates.longitude, house_system_data->sweph_id, cusps, ascmc);
 
-    g_list_free_full(moment->priv->house_list, g_free);
-    moment->priv->house_list = NULL;
-
     /* TODO: SWE house system 'G' (Gauquelin sector cusps) have 36 houses; we
      * should detect that somehow (house system 'G' is not implemented yet in
      * GsweHouseSystem, and all other house systems have exactly 12 houses, so
@@ -547,6 +552,8 @@ gswe_moment_calculate_house_positions(GsweMoment *moment, GError **err)
 
     moment->priv->house_revision = moment->priv->revision;
 
+    // The Ascendent, MC and Vertex points are also calculated by swe_houses(),
+    // so let's update them.
     if (gswe_moment_has_planet(moment, GSWE_PLANET_ASCENDENT)) {
         gswe_calculate_data_by_position(moment, GSWE_PLANET_ASCENDENT, ascmc[0], err);
     }
@@ -612,6 +619,10 @@ gswe_moment_add_planet(GsweMoment *moment, GswePlanet planet)
     }
 
     if ((planet_info = g_hash_table_lookup(gswe_planet_info_table, GINT_TO_POINTER(planet))) == NULL) {
+        // TODO: Some real error checking should be done here, like checking if
+        // @planet is really from GswePlanet. If so, that is a fatal error.
+        // Otherwise, the developer erred, and a warning may be still issued.
+        // Also, a GError ** should be added to the parameters.
         g_warning("Unknown planet ID: %d", planet);
 
         return;
@@ -620,7 +631,7 @@ gswe_moment_add_planet(GsweMoment *moment, GswePlanet planet)
     planet_data->planet_id = planet;
     planet_data->planet_info = planet_info;
     planet_data->position = 0.0;
-    planet_data->house = 1;
+    planet_data->house = 0;
     planet_data->sign = NULL;
     planet_data->revision = 0;
 
@@ -666,6 +677,7 @@ gswe_moment_calculate_planet(GsweMoment *moment, GswePlanet planet, GError **err
         return;
     }
 
+    // TODO: This function should know about Ascendant, MC and Vertex, so it could calculate their positions, too
     if (planet_data->planet_info->real_body == FALSE) {
         g_warning("The position data of planet %d can not be calculated by this function", planet);
 
@@ -773,6 +785,11 @@ gswe_moment_get_house_planets(GsweMoment *moment, guint house)
     GList *ret = NULL,
           *planet;
 
+    // If the house system is none, we always return NULL
+    if (moment->priv->house_system == GSWE_HOUSE_SYSTEM_NONE) {
+        return NULL;
+    }
+
     gswe_moment_calculate_all_planets(moment);
 
     for (planet = moment->priv->planet_list; planet; planet = g_list_next(planet)) {
@@ -1161,13 +1178,14 @@ gswe_moment_get_planet_aspects(GsweMoment *moment, GswePlanet planet, GError **e
 }
 
 static gboolean
-find_antiscion(GsweAntiscionAxis *axis, GsweAntiscionAxisInfo *antiscion_info, GsweAntiscionData *antiscion_data)
+find_antiscion(gpointer axis_p, GsweAntiscionAxisInfo *antiscion_info, GsweAntiscionData *antiscion_data)
 {
+    GsweAntiscionAxis axis;
     gdouble start_point,
             axis_position,
             planet_orb;
 
-    if (*axis == GSWE_ANTISCION_AXIS_NONE) {
+    if ((axis = GPOINTER_TO_INT(axis_p)) == GSWE_ANTISCION_AXIS_NONE) {
         return FALSE;
     }
 
@@ -1186,7 +1204,7 @@ find_antiscion(GsweAntiscionAxis *axis, GsweAntiscionAxisInfo *antiscion_info, G
 
     if ((antiscion_data->difference = fabs(antiscion_data->planet2->position - axis_position)) <= planet_orb) {
         antiscion_data->antiscion_info = antiscion_info;
-        antiscion_data->axis = *axis;
+        antiscion_data->axis = axis;
 
         return TRUE;
     } else {

src/gswe-moment.h

@@ -1,20 +1,19 @@
 /* gswe-moment.h - Planetary moment object for SWE-GLib
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #ifndef __GSWE_MOMENT_H__
 #define __GSWE_MOMENT_H__

src/gswe-timestamp.c

@@ -1,21 +1,20 @@
 /* gswe-timestamp.c - Converter GObject between Gregorian calendar date and
  * Julian day
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include <math.h>
 #include <glib.h>

src/gswe-timestamp.h

@@ -1,21 +1,20 @@
 /* gswe-timestamp.h - Converter GObject between Gregorian calendar date and
  * Julian day
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #ifndef __SWE_GLIB_GSWE_TIMESTAMP_H__
 #define __SWE_GLIB_GSWE_TIMESTAMP_H__

src/gswe-types.c

@@ -1,3 +1,20 @@
+/* gswe-types.h - Basic types of SWE-GLib
+ *
+ * Copyright © 2013  Gergely Polonkai
+ *
+ * SWE-GLib is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SWE-GLib 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
 #include "gswe-types.h"
 
 static GsweMoonPhaseData *

src/gswe-types.h

@@ -1,23 +1,22 @@
 /* gswe-types.h - Basic types of SWE-GLib
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifndef __SWE_GLIB_GSWE_PLANETS_H__
+#ifndef __SWE_GLIB_GSWE_TYPES_H__
-#define __SWE_GLIB_GSWE_PLANETS_H__
+#define __SWE_GLIB_GSWE_TYPES_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -475,5 +474,5 @@ typedef struct {
 GType gswe_antiscion_data_get_type(void);
 #define GSWE_TYPE_ANTISCION_DATA (gswe_antiscion_data_get_type())
 
-#endif /* __SWE_GLIB_GSWE_PLANETS_H__ */
+#endif /* __SWE_GLIB_GSWE_TYPES_H__ */
 

src/swe-glib-private.h

@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #ifdef __SWE_GLIB_BUILDING__
 #ifndef __SWE_GLIB_PRIVATE_H__

src/swe-glib.c

@@ -1,20 +1,19 @@
 /* SWE-GLib - GLib style wrapper library around Astrodienst's Swiss Ephemeris
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include <glib.h>
 #define GETTEXT_PACKAGE "swe-glib"

src/swe-glib.h

@@ -1,20 +1,19 @@
 /* SWE-GLib - GLib style wrapper library around Astrodienst's Swiss Ephemeris
  *
- * Copyright (C) 2013  Gergely Polonkai
+ * Copyright © 2013  Gergely Polonkai
  *
- * SWE-GLib is free software; you can redistribute it and/or modify it under
+ * SWE-GLib is free software: you can redistribute it and/or modify
- * the terms of the GNU Lesser General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your opinion)
+ * the Free Software Foundation; either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * SWE-GLib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * SWE-GLib is distributed in the hope that it will be useful,
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software Foundation,
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #ifndef __SWE_GLIB_H__
 #define __SWE_GLIB_H__