[gtk-internet-radio-locator] Build on Fedora 28



commit b67bed2e1139544d5cae79222c66527961759568
Author: Ole Aamot <ole gnome org>
Date:   Tue May 29 21:35:23 2018 +0200

    Build on Fedora 28

 gtk-internet-radio-locator.spec.in       |  9 ++++++++-
 src/gtk-internet-radio-locator-station.c | 14 +++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/gtk-internet-radio-locator.spec.in b/gtk-internet-radio-locator.spec.in
index 62ba91f..8eb5297 100644
--- a/gtk-internet-radio-locator.spec.in
+++ b/gtk-internet-radio-locator.spec.in
@@ -54,8 +54,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/%{name}.1*
+%{_datadir}/icons/hicolor/1024x1024/apps/gnome-internet-radio-locator.png
+%{_datadir}/icons/hicolor/16x16/apps/gnome-internet-radio-locator.png
+%{_datadir}/icons/hicolor/22x22/apps/gnome-internet-radio-locator.png
+%{_datadir}/icons/hicolor/24x24/apps/gnome-internet-radio-locator.png
+%{_datadir}/icons/hicolor/256x256/apps/gnome-internet-radio-locator.png
+%{_datadir}/icons/hicolor/32x32/apps/gnome-internet-radio-locator.png
+%{_datadir}/icons/hicolor/48x48/apps/gnome-internet-radio-locator.png
+%{_datadir}/icons/hicolor/512x512/apps/gnome-internet-radio-locator.png
 
 %changelog
 * Tue May 29 2018 Ole Aamot <ole gnome org> - 0.0.1-1
diff --git a/src/gtk-internet-radio-locator-station.c b/src/gtk-internet-radio-locator-station.c
index 26dffa2..99821f7 100644
--- a/src/gtk-internet-radio-locator-station.c
+++ b/src/gtk-internet-radio-locator-station.c
@@ -131,13 +131,13 @@ void gtk_internet_radio_locator_helper_run(gchar *url, gchar *name, GTKInternetR
                                                gtk_internet_radio_locator->selected_station_location,
                                                gtk_internet_radio_locator->selected_archive_file);           
  
                                
-                               command = g_strconcat(app, " ", url, " -d ", g_get_home_dir(), 
"/.gtk_internet_radio_locator/ -D %D", NULL);
+                               command = g_strconcat(app, " ", url, " -d ", g_get_home_dir(), 
"/.internet_radio_locator/ -D %D", NULL);
                                GTK_INTERNET_RADIO_LOCATOR_DEBUG_MSG("%s\n", command);
 
                                // gtk_internet_radio_locator_archive_new("Archive", 
gtk_internet_radio_locator->selected_archive_file);
                                
                                /* " -d ", g_get_home_dir(), "/.gtk_internet_radio_locator -D \"", name, "\" 
-s -a -u gtk_internet_radio_locator/", VERSION, NULL); */
-                               /* command = g_strconcat(command, " -d ", g_get_home_dir(), 
"/.gtk_internet_radio_locator/", name, " -D %S%A%T -t 10 -u gtk_internet_radio_locator/", VERSION, NULL); */
+                               /* command = g_strconcat(command, " -d ", g_get_home_dir(), 
"/.internet_radio_locator/", name, " -D %S%A%T -t 10 -u internet_radio_locator/", VERSION, NULL); */
                        }
                        GTK_INTERNET_RADIO_LOCATOR_DEBUG_MSG("Helper command is %s\n", command);
                }
@@ -282,7 +282,7 @@ void gtk_internet_radio_locator_helper_run(gchar *url, gchar *name, GTKInternetR
 /* #if 0 */
                /* gchar *argv[] = { command, NULL }; */
                /* Spawn child process */
-               gchar *recording_path_name = g_strconcat(g_get_home_dir(), "/.gtk_internet_radio_locator/", 
NULL);
+               gchar *recording_path_name = g_strconcat(g_get_home_dir(), "/.internet_radio_locator/", NULL);
                gchar *formatting_argument = g_strdup("-D %D");
                gtk_internet_radio_locator->record_launcher = g_subprocess_launcher_new 
(G_SUBPROCESS_FLAGS_NONE);
                /* gtk_internet_radio_locator->record_subprocess = g_subprocess_launcher_spawn 
(gtk_internet_radio_locator->record_launcher, &error, GTK_INTERNET_RADIO_LOCATOR_HELPER_RECORD, url, "-d", 
recording_path_name, "-D", "%D", NULL); */
@@ -544,9 +544,9 @@ GTKInternetRadioLocatorStationInfo *gtk_internet_radio_locator_station_load_from
                return NULL;
        }
 
-       if (xmlStrcmp(cur->name, (const xmlChar *) "gtk_internet_radio_locator")) {
+       if (xmlStrcmp(cur->name, (const xmlChar *) "internet_radio_locator")) {
                fprintf(stderr,
-                       "Document of wrong type, root node != gtk_internet_radio_locator\n");
+                       "Document of wrong type, root node != internet_radio_locator\n");
                xmlFreeDoc(doc);
                return NULL;
        }
@@ -626,7 +626,7 @@ gint gtk_internet_radio_locator_station_update (GTKInternetRadioLocatorStationIn
        new_station->stream->uri = g_strdup(station_uri);
        new_station->uri = g_strdup(station_website);
        fp = g_fopen(stations, "w+");
-       g_fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE gtk_internet_radio_locator SYSTEM 
'gtk_internet_radio_locator-0.1.dtd'>\n<gtk_internet_radio_locator version='%s'>\n", VERSION);
+       g_fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE internet_radio_locator SYSTEM 
'internet_radio_locator-1.5.dtd'>\n<internet_radio_locator version='%s'>\n", VERSION);
        // stationinfo-> = l->data;
        while (stationinfo != NULL) {
                local_station_uri = g_strdup(stationinfo->stream->uri);
@@ -641,7 +641,7 @@ gint gtk_internet_radio_locator_station_update (GTKInternetRadioLocatorStationIn
 
        }
        g_fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" type=\"org\">\n  
  <frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
new_station->band, new_station->name, new_station->name, new_station->uri, new_station->band, 
new_station->location, new_station->location, new_station->description, new_station->stream->uri, 
new_station->uri);
-       g_fprintf(fp, "</gtk_internet_radio_locator>\n");
+       g_fprintf(fp, "</internet_radio_locator>\n");
        fclose(fp);
        gtk_internet_radio_locator_stations = g_list_append(gtk_internet_radio_locator_stations, 
(GTKInternetRadioLocatorStationInfo *)new_station);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]