C89 → C99

[batteryviewer] / batteryviewer.c

diff --git a/batteryviewer.c b/batteryviewer.c
index 4a1a8509076c4e0225b104c21a31b52a09886ac2..3b5add9a9d90b78f2a4ff569166d355b685341b5 100644 (file)
--- a/batteryviewer.c
+++ b/batteryviewer.c
@@ -1,31 +1,35 @@
 #include <gtk/gtk.h>
 
-static void print_hello(GtkWidget *widget, gpointer data) {
+static void print_hello(GtkWidget *widget __attribute__((unused)),
+                        gpointer data __attribute__((unused))) {
   g_print("Hello World\n");
 }
 
-static void activate(GtkApplication *app, gpointer user_data) {
-  GtkWidget *window;
-  GtkWidget *button;
+static void activate(GtkApplication *app,
+                     gpointer user_data __attribute__((unused))) {
 
-  window = gtk_application_window_new(app);
+  GtkWidget *window = gtk_application_window_new(app);
   gtk_window_set_title(GTK_WINDOW(window), "Window");
   gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
 
-  button = gtk_button_new_with_label("Hello World");
+  GtkWidget *button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+  gtk_container_add(GTK_CONTAINER(window), button_box);
+
+  GtkWidget *button = gtk_button_new_with_label("Hello World");
   g_signal_connect(button, "clicked", G_CALLBACK(print_hello), NULL);
-  gtk_window_set_child(GTK_WINDOW(window), button);
+  g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy),
+                           window);
+  gtk_container_add(GTK_CONTAINER(button_box), button);
 
-  gtk_window_present(GTK_WINDOW(window));
+  gtk_widget_show_all(window);
 }
 
 int main(int argc, char **argv) {
-  GtkApplication *app;
-  int status;
 
-  app = gtk_application_new("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  GtkApplication *app =
+      gtk_application_new("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
-  status = g_application_run(G_APPLICATION(app), argc, argv);
+  int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);
 
   return status;