GNOME.org
 

[gnome-internet-radio-locator] Add Houston marker, center map on Houston and remove the gsettings.

commit fb2f3a006a6d80d334e67543349a19dc2dbf5291
Author: Ole Aamot <ole gnome org>
Date:   Thu Apr 26 15:55:21 2018 +0200

    Add Houston marker, center map on Houston and remove the gsettings.

 AUTHORS                                                    |  1 +
 NEWS                                                       | 13 +++++++++++++
 THANKS                                                     |  1 +
 configure.ac                                               | 10 +---------
 data/Makefile.am                                           |  8 +-------
 data/org.gnome.gnome-internet-radio-locator.gschema.xml    | 13 -------------
 data/org.gnome.gnome-internet-radio-locator.gschema.xml.in | 13 -------------
 gnome-internet-radio-locator.spec.in                       |  5 +++--
 po/POTFILES.in                                             |  1 -
 src/gnome-internet-radio-locator-markers.c                 |  9 +++++++++
 src/gnome-internet-radio-locator.c                         |  2 +-
 11 files changed, 30 insertions(+), 46 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index df4f3de..0605762 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,3 +20,4 @@ Gabor Kelemen (Hungarian translation)
 Tim Sabsch (German translation)
 Justin van Steijn (Dutch translation)
 Rafael Fontenelle (Brazilian Portuguese translation)
+Rodrigo (Spanish translation)
diff --git a/NEWS b/NEWS
index 7b4e5b2..8280a3a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+=============
+Version 1.1.1
+=============
+
+GUI
+
+       * src/gnome-internet-radio-locator-markers.c: Add Houston, Texas
+       * src/gnome-internet-radio-locator.c: Set default center Houston
+
+Translations
+
+       * po/es.po: Updated Spanish translation (Rodrigo)
+
 =============
 Version 1.1.0
 =============
diff --git a/THANKS b/THANKS
index 67b8e65..055bd5a 100644
--- a/THANKS
+++ b/THANKS
@@ -25,3 +25,4 @@ Gabor Kelemen (Hungarian translation)
 Tim Sabsch (German translation)
 Justin van Steijn (Dutch translation)
 Rafael Fontenelle (Brazilian Portuguese translation)
+Rodrigo (Spanish translation)
diff --git a/configure.ac b/configure.ac
index fd6c2d2..facb339 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(gnome-internet-radio-locator,1.1.0)
+AC_INIT(gnome-internet-radio-locator,1.1.1)
 AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/gnome-internet-radio-locator.c])
@@ -91,7 +91,6 @@ PKG_CHECK_MODULES(GNOME_INTERNET_RADIO_LOCATOR,
                  glib-2.0 >= 2.38.0 \
                  gobject-2.0 >= 2.38.0 \
                  gstreamer-1.0 >= 1.0 \
-                 gsettings-desktop-schemas >= 2.91.92 \
                  gstreamer-player-1.0 >= 1.0 \
                  gstreamer-tag-1.0 >= 1.0 \
                  gstreamer-video-1.0 \
@@ -133,17 +132,10 @@ AC_SUBST(GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS)
 dnl Enable yelp-tools
 # YELP_HELP_INIT
 
-# *********
-# GSettings
-# *********
-
-GLIB_GSETTINGS
-
 AC_OUTPUT([
 Makefile
 data/Makefile
 data/gnome-internet-radio-locator.desktop
-data/org.gnome.gnome-internet-radio-locator.gschema.xml
 data/icons/Makefile
 data/icons/16x16/Makefile
 data/icons/22x22/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 53e0fab..34b2fdf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,12 +13,6 @@ appdatadir = $(datadir)/appdata
 appdata_in_files = gnome-internet-radio-locator.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
-gsettings_ENUM_NAMESPACE = org.gnome.gnome-internet-radio-locator
-gsettings_ENUM_FILES = $(top_srcdir)/src/gnome-internet-radio-locator-gui.h
-gsettings_SCHEMAS = org.gnome.gnome-internet-radio-locator.gschema.xml
-
-@GSETTINGS_RULES@
-
 # gsettingsconvertdir = $(datadir)/GConf/gsettings
 # gsettingsconvert_DATA = eog.convert
 
@@ -33,6 +27,6 @@ EXTRA_DIST = $(DESKTOP_IN_FILES) $(appdata_in_files)
 
 CLEANFILES = $(appdata_DATA)
 
-DISTCLEANFILES = $(DESKTOP_FILES) $(gsettings_SCHEMAS)
+DISTCLEANFILES = $(DESKTOP_FILES)
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome-internet-radio-locator.spec.in b/gnome-internet-radio-locator.spec.in
index 12b92d9..132a837 100644
--- a/gnome-internet-radio-locator.spec.in
+++ b/gnome-internet-radio-locator.spec.in
@@ -67,12 +67,13 @@ fi
 %{_datadir}/%{name}/
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/glib-2.0/schemas/org.gnome.%{name}.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Apr 22 2018 Ole Aamot <ole gnome org> - 1.1.1-1
+- gnome-internet-radio-locator 1.1.1 build on Fedora Linux 27
+
 * Sat Apr 21 2018 Ole Aamot <ole gnome org> - 1.1.0-1
 - gnome-internet-radio-locator 1.1.0 build on Fedora Linux 27
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2d35c21..c72ed6e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@
 [encoding: UTF-8]
 data/gnome-internet-radio-locator.appdata.xml.in
 data/gnome-internet-radio-locator.desktop.in.in
-[type: gettext/gsettings]data/org.gnome.gnome-internet-radio-locator.gschema.xml.in
 src/gnome-internet-radio-locator-gui.c
 src/gnome-internet-radio-locator-listener.c
 src/gnome-internet-radio-locator-station.c
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index e424a20..3511ee0 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -175,6 +175,15 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
   /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
   g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
   marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+  station = g_strdup("Houston, Texas\n<span size=\"xx-small\">Coog Radio, University of Houston</span>");
+  champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
+  champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
+  champlain_location_set_location (CHAMPLAIN_LOCATION (marker),29.7589382,-95.3676974);
+  champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+  champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
+  /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+  g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
+  marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
   station = g_strdup("London, United Kingdom\n<span size=\"xx-small\">Imperial College Radio</span>");
   champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
   champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
diff --git a/src/gnome-internet-radio-locator.c b/src/gnome-internet-radio-locator.c
index 1c60153..64a18d7 100644
--- a/src/gnome-internet-radio-locator.c
+++ b/src/gnome-internet-radio-locator.c
@@ -796,7 +796,7 @@ main (int argc,
 
        license_actor = champlain_view_get_license_actor (view);
        champlain_license_set_extra_text (license_actor, "Free Internet Radio");
-       champlain_view_center_on (CHAMPLAIN_VIEW (view), 52.0367323, 1.168934);
+       champlain_view_center_on (CHAMPLAIN_VIEW (view), 29.7589382, -95.3676974);
        layer = create_marker_layer (view, &path);
        champlain_view_add_layer (view, CHAMPLAIN_LAYER (path));
        champlain_view_add_layer (view, CHAMPLAIN_LAYER (layer));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]