diff --git a/ch.gnugen.Moody.json b/ch.gnugen.Moody.json index f32597da484c5ef6e56fa950ea69bb0d379a4f07..570e0c1a3d9ab00ddf02e607b79440615800c555 100644 --- a/ch.gnugen.Moody.json +++ b/ch.gnugen.Moody.json @@ -3,7 +3,6 @@ "runtime" : "org.gnome.Platform", "runtime-version" : "3.30", "sdk" : "org.gnome.Sdk", - "license" : "GPL-3.0+", "command" : "moody", "tags" : [ "devel", @@ -50,7 +49,11 @@ { "name" : "myhtml", "buildsystem" : "simple", - "build-commands" : ["make library", "make install", "cp *.pc /app/lib/pkgconfig/"], + "build-commands" : [ + "make library", + "make install", + "cp *.pc /app/lib/pkgconfig/" + ], "sources" : [ { "type" : "git", diff --git a/meson.build b/meson.build index a352714f6330cc2ebfd755605ee317a70295fb5f..9428b561e384f9668e6807453423b07f978e7578 100644 --- a/meson.build +++ b/meson.build @@ -79,9 +79,6 @@ if get_option('buildtype') != 'plain' test_c_args += '-fstack-protector-strong' endif endif -#if get_option('profiling') - test_c_args += '-pg' -#endif foreach arg: test_c_args if cc.has_multi_arguments(arg) diff --git a/src/gui-course.c b/src/gui-course.c index f6beb9fd17e01b280bd6907187975d107b201b98..944f83359db4dfc59bfe39b28da0979c3174157f 100644 --- a/src/gui-course.c +++ b/src/gui-course.c @@ -55,6 +55,10 @@ gui_course_new (struct Course course_info) NULL); } +static void destroy_widget (GtkWidget *w, gpointer nothing) { + gtk_widget_destroy (w); +} + void update_course_content (GtkWidget *self_widget, gpointer unused) { @@ -64,9 +68,6 @@ update_course_content (GtkWidget *self_widget, gpointer unused) GtkStack *stack = GTK_STACK (gtk_widget_get_parent (self_widget)); // clean up the current content - void destroy_widget (GtkWidget *w, gpointer nothing) { - gtk_widget_destroy (w); - } gtk_container_foreach (GTK_CONTAINER (self->box_week), &destroy_widget, NULL); if (self_widget != gtk_stack_get_visible_child (stack)) diff --git a/src/gui-window.c b/src/gui-window.c index 4f3f36ced66bd916ebcb247fa9096cd70fd4f707..1a23cb7a5e82a4df58ddb7b852d0128020f67f33 100644 --- a/src/gui-window.c +++ b/src/gui-window.c @@ -202,14 +202,21 @@ update_header_bar (GuiWindow *self) // g_str_equal (visible_child_name, "search-bar")); } +static void +destroy_widget (GtkWidget *w, gpointer unused) { + gtk_widget_destroy (w); +} +static void +ellipsize_label (GtkWidget *list_item, gpointer unused) { + GtkLabel *label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (list_item))); + gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); +} + static void update_courses (GuiWindow *self) { // clean up the current stack - void destroy_widget (GtkWidget *w, gpointer unused) { - gtk_widget_destroy (w); - } - gtk_container_foreach (GTK_CONTAINER (self->stack), &destroy_widget, NULL); + gtk_container_foreach (GTK_CONTAINER (self->stack), destroy_widget, NULL); // and replace its content for (int i=0; i<self->course_count; i++) { @@ -227,10 +234,6 @@ update_courses (GuiWindow *self) GtkWidget *viewport = gtk_bin_get_child (GTK_BIN (scrolled_win)); GtkWidget *label_list = gtk_bin_get_child (GTK_BIN (viewport)); - void ellipsize_label (GtkWidget *list_item, gpointer unused) { - GtkLabel *label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (list_item))); - gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); - } gtk_container_foreach (GTK_CONTAINER (label_list), ellipsize_label, NULL); }