diff --git a/ChangeLog b/ChangeLog index d00004be2cf68a5a88f1fea607eb43eee2ffbac3..a31027e5020d0049a03c8c8fadf60eabc6fe509c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +commit ceca68cd0f88269d1685a79baec322909b6ac9ea +Author: Ole Aamot +Date: Tue Jul 14 15:24:21 2020 +0200 + + GNOME Gingerblue 0.1.8 + + ChangeLog | 11 +++++++++++ + NEWS | 9 +++++++++ + configure.ac | 2 +- + data/gingerblue.appdata.xml.in | 10 +++++----- + 4 files changed, 26 insertions(+), 6 deletions(-) + commit ca7691324d464598ac89fb50639041e7ff1cd4fd Author: Ole Aamot Date: Tue Jul 14 15:11:01 2020 +0200 diff --git a/gingerblue.spec.in b/gingerblue.spec.in index dda50a2a2bae9bd0dfdda18fa1de5ea4d210410c..879acc592748432e22104b158c7353ba500a0f9b 100644 --- a/gingerblue.spec.in +++ b/gingerblue.spec.in @@ -51,6 +51,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Tue Jul 14 2020 Ole Aamot - 0.1.8-0 +- Fix Fedora Core 32 build + * Tue Jul 14 2020 Ole Aamot - 0.1.7-0 - Add cancellation of a recording loop diff --git a/src/gingerblue-config.c b/src/gingerblue-config.c index 7f66071b8c77cf7d35d6a853026c25730e10dfd0..58d72ce07b8a389a3b446118e7ce8c53a8693daf 100644 --- a/src/gingerblue-config.c +++ b/src/gingerblue-config.c @@ -21,7 +21,7 @@ GtkWidget *main_config (gchar *location_data) { GingerblueData *Gingerblue; GtkButton *AddStudioButton; GtkButton *NewStudioButton; - GtkVBox *Studio; + GtkBox *Studio; GtkMisc *Location; GtkContainer *Container; GtkWindow *gingerblue; @@ -31,10 +31,10 @@ GtkWidget *main_config (gchar *location_data) { NewStudioButton = gtk_button_new_with_label("New Studio"); Studio = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); Location = gtk_list_box_new (); - gtk_container_add (GTK_CONTAINER (gingerblue), GTK_BOX (Studio)); - gtk_box_pack_start (GTK_BOX (Studio), GTK_BUTTON (AddStudioButton), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (Studio), GTK_LIST_BOX (Location), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (Studio), GTK_BUTTON (NewStudioButton), TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (gingerblue), GTK_WIDGET (Studio)); + gtk_box_pack_start (GTK_WIDGET (Studio), GTK_BUTTON (AddStudioButton), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_WIDGET (Studio), GTK_MISC (Location), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_WIDGET (Studio), GTK_BUTTON (NewStudioButton), TRUE, TRUE, 0); gtk_widget_show_all (GTK_WIDGET (gingerblue)); return (GtkWidget *) gingerblue; } diff --git a/src/gingerblue-main.c b/src/gingerblue-main.c index dff28bc9046349e1b36a11943bdd240198d0bf42..e49011a96a272c71f20dc7525e761f50b03c6337 100644 --- a/src/gingerblue-main.c +++ b/src/gingerblue-main.c @@ -63,9 +63,7 @@ static void gb_assistant_cancel (GtkAssistant *assistant, gpointer data) g_error ("Quit more loops than there are."); } else { GMainLoop *loop = main_loops; - main_loops = g_slist_delete_link (main_loops, main_loops); g_main_loop_quit (loop); - g_main_loop_unref (loop); gtk_main_quit(); } } @@ -145,35 +143,36 @@ int main (int argc, char **argv) { musician_label = gtk_label_new ("Musician:"); musician_entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (musician_entry), g_get_real_name()); - gtk_box_pack_start (GTK_BOX (page[1].widget), musician_label, FALSE, FALSE, 5); - gtk_box_pack_start (GTK_BOX (page[1].widget), musician_entry, FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[1].widget), GTK_WIDGET (musician_label), FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[1].widget), GTK_WIDGET (musician_entry), FALSE, FALSE, 5); page[2].widget = gtk_box_new (FALSE, 5); song_label = gtk_label_new ("Song:"); song_entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (song_entry), "Song"); - gtk_box_pack_start (GTK_BOX (page[2].widget), song_label, FALSE, FALSE, 5); - gtk_box_pack_start (GTK_BOX (page[2].widget), song_entry, FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[2].widget), GTK_WIDGET (song_label), FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[2].widget), GTK_WIDGET (song_entry), FALSE, FALSE, 5); page[3].widget = gtk_box_new (FALSE, 5); instrument_label = gtk_label_new ("Instrument:"); instrument_entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (instrument_entry), "Guitar"); - gtk_box_pack_start (GTK_BOX (page[3].widget), instrument_label, FALSE, FALSE, 5); - gtk_box_pack_start (GTK_BOX (page[3].widget), instrument_entry, FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[3].widget), GTK_WIDGET (instrument_label), FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[3].widget), GTK_WIDGET (instrument_entry), FALSE, FALSE, 5); page[4].widget = gtk_box_new (FALSE, 5); line_label = gtk_label_new ("Line Input:"); line_entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (line_entry), "Mic"); - gtk_box_pack_start (GTK_BOX (page[4].widget), line_label, FALSE, FALSE, 5); - gtk_box_pack_start (GTK_BOX (page[4].widget), line_entry, FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[4].widget), GTK_WIDGET (line_label), FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[4].widget), GTK_WIDGET (line_entry), FALSE, FALSE, 5); page[5].widget = gtk_box_new (FALSE, 5); label_label = gtk_label_new ("Label:"); label_entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (label_entry), "GNOME"); - gtk_box_pack_start (GTK_BOX (page[5].widget), label_label, FALSE, FALSE, 5); - gtk_box_pack_start (GTK_BOX (page[5].widget), label_entry, FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[5].widget), GTK_WIDGET (label_label), FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (page[5].widget), GTK_WIDGET (label_entry), FALSE, FALSE, 5); recording_label = gtk_button_new_with_label ("Record"); g_signal_connect (G_OBJECT (recording_label), "clicked", G_CALLBACK (gb_record_cb), g_strconcat (g_get_user_special_dir (G_USER_DIRECTORY_MUSIC), "/", g_get_real_name(), " - ", gtk_entry_get_text (GTK_ENTRY (song_entry)), ".ogg", NULL)); - page[6].widget = gtk_button_new_with_label ("Record"); gtk_box_pack_start (GTK_BOX (page[6].widget), recording_label, FALSE, FALSE, 5); + page[6].widget = gtk_button_new_with_label ("Record"); + gtk_box_pack_start (GTK_BOX (page[6].widget), GTK_WIDGET (recording_label), FALSE, FALSE, 5); for (i = 0; i < 7; i++) { page[i].index = gtk_assistant_append_page (GTK_ASSISTANT (introduction), GTK_WIDGET (page[i].widget)); diff --git a/src/gingerblue-studio-config.c b/src/gingerblue-studio-config.c index 8a214342232797f1ddd292de1b239000795b8365..499ac068e791ac65f00c054f39094f5cfc59f4c2 100644 --- a/src/gingerblue-studio-config.c +++ b/src/gingerblue-studio-config.c @@ -14,15 +14,13 @@ GtkWidget *main_studio_config (gchar *location_data, gchar *studio_city) { GingerblueData *Gingerblue; - GtkBox *Locations; + GtkVBox *Locations; GtkMisc *Location; GtkContainer *Container; Locations = gtk_box_new (ATK_STATE_VERTICAL, 1); Location = gtk_list_box_new (); gtk_container_add (GTK_CONTAINER (Container), GTK_BOX (Locations)); gtk_container_add (GTK_CONTAINER (Container), GTK_LIST_BOX (Location)); - gtk_container_add (GTK_CONTAINER (Container), GTK_BOX(Locations)); - gtk_container_add (GTK_CONTAINER (Container), GTK_LIST_BOX(Location)); gtk_widget_show_all (GTK_WIDGET (Container)); return (GtkWidget *) Gingerblue; }