pretty

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 320a14d59de224a17a8a36c9de2d45c5981ea44e..da65a8a8e0be8b02ab3d51883d9dcb88b6579a54 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -140,9 +140,11 @@ static void update_time_widget(AWeatherView *view, char *time, AWeatherGui *gui)
                gtk_tree_model_get(model, &iter, 0, &text, -1);
                if (g_str_equal(text, time)) {
                        GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
-                       g_signal_handlers_block_by_func(tview, G_CALLBACK(on_site_changed), gui);
+                       g_signal_handlers_block_by_func(tview,
+                                       G_CALLBACK(on_site_changed), gui);
                        gtk_tree_view_set_cursor(tview, path, NULL, FALSE);
-                       g_signal_handlers_unblock_by_func(tview, G_CALLBACK(on_site_changed), gui);
+                       g_signal_handlers_unblock_by_func(tview,
+                                       G_CALLBACK(on_site_changed), gui);
                        return;
                }
        }
@@ -162,9 +164,11 @@ static void update_location_widget(AWeatherView *view, char *location, AWeatherG
                        gtk_tree_model_get(model, &iter2, 1, &text, -1);
                        if (g_str_equal(text, location)) {
                                GtkTreePath *path = gtk_tree_model_get_path(model, &iter2);
-                               g_signal_handlers_block_by_func(combo, G_CALLBACK(on_site_changed), gui);
+                               g_signal_handlers_block_by_func(combo,
+                                               G_CALLBACK(on_site_changed), gui);
                                gtk_combo_box_set_active_iter(combo, &iter2);
-                               g_signal_handlers_unblock_by_func(combo, G_CALLBACK(on_site_changed), gui);
+                               g_signal_handlers_unblock_by_func(combo,
+                                               G_CALLBACK(on_site_changed), gui);
                                g_free(text);
                                return;
                        }
@@ -237,7 +241,8 @@ gboolean opengl_setup(AWeatherGui *gui)
                        GDK_GL_MODE_DOUBLE | GDK_GL_MODE_ALPHA);
        if (!glconfig)
                g_error("Failed to create glconfig");
-       if (!gtk_widget_set_gl_capability(GTK_WIDGET(drawing), glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
+       if (!gtk_widget_set_gl_capability(GTK_WIDGET(drawing),
+                               glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
                g_error("GL lacks required capabilities");
 
        /* Set up OpenGL Stuff */

diff --git a/src/data.c b/src/data.c
index ab373114c6b0f3e3529f2208d1d1d8bc53860951..06c9fbb177e8b11ae0279707dc1417d8e32de10b 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -47,7 +47,8 @@ static void cache_file_cb(GObject *source_object, GAsyncResult *res, gpointer _i
 static goffset g_file_get_size(GFile *file)
 {
        GError *error = NULL;
-       GFileInfo *info = g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_SIZE, 0, NULL, &error);
+       GFileInfo *info = g_file_query_info(file,
+                       G_FILE_ATTRIBUTE_STANDARD_SIZE, 0, NULL, &error);
        if (error)
                g_warning("unable to get file size: %s", error->message);
        return g_file_info_get_size(info);

diff --git a/src/plugin-radar.c b/src/plugin-radar.c
index 0990858d9087d499385dfc67cfb4ec63746d7ec4..dbf71957fd796c45d6036e5a7e38cba1004759a8 100644 (file)
--- a/src/plugin-radar.c
+++ b/src/plugin-radar.c
@@ -99,7 +99,8 @@ static void load_sweep(Sweep *sweep)
        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0,
+                       GL_RGBA, GL_UNSIGNED_BYTE, data);
        g_free(data);
        gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
        aweather_gui_gl_end(gui);
@@ -123,11 +124,15 @@ static void load_radar_gui(Radar *radar)
                for (si = vol->h.nsweeps-1; si >= 0; si--) {
                        Sweep *sweep = vol->sweep[si];
                        if (sweep == NULL) continue;
-                       char *label = g_strdup_printf("Tilt: %.2f (%s)", sweep->h.elev, vol->h.type_str);
-                       button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), label);
+                       char *label = g_strdup_printf("Tilt: %.2f (%s)",
+                                       sweep->h.elev, vol->h.type_str);
+                       button = gtk_radio_button_new_with_label_from_widget(
+                                       GTK_RADIO_BUTTON(button), label);
                        g_object_set(button, "draw-indicator", FALSE, NULL);
-                       g_signal_connect_swapped(button, "clicked", G_CALLBACK(load_color_table), vol->h.type_str);
-                       g_signal_connect_swapped(button, "clicked", G_CALLBACK(load_sweep), sweep);
+                       g_signal_connect_swapped(button, "clicked",
+                                       G_CALLBACK(load_color_table), vol->h.type_str);
+                       g_signal_connect_swapped(button, "clicked",
+                                       G_CALLBACK(load_sweep), sweep);
                        gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, TRUE, 0);
                        g_free(label);
                }
@@ -200,7 +205,8 @@ static void load_radar(char *path, gpointer user_data)
                        &pid,    // GPid *child_pid,
                        &error); // GError **error
                if (error)
-                       g_warning("failed to decompress WSR88D data: %s", error->message);
+                       g_warning("failed to decompress WSR88D data: %s",
+                                       error->message);
                g_child_watch_add(pid, load_radar_rsl, raw);
        }
 }
@@ -304,7 +310,9 @@ static void set_site(AWeatherView *view, char *site, gpointer user_data)
        gchar *data;
        gsize length;
        GError *error = NULL;
-       char *list_uri = g_strdup_printf("http://mesonet.agron.iastate.edu/data/nexrd2/raw/K%s/dir.list", site);
+       char *list_uri = g_strdup_printf(
+                       "http://mesonet.agron.iastate.edu/data/nexrd2/raw/K%s/dir.list",
+                       site);
        GFile *list    = g_file_new_for_uri(list_uri);
        g_free(list_uri);
        cur_sweep = NULL; // Clear radar
@@ -340,14 +348,17 @@ gboolean radar_init(AWeatherGui *_gui)
 {
        gui = _gui;
        drawing = aweather_gui_get_widget(gui, "drawing");
-       GtkNotebook    *config  = GTK_NOTEBOOK(aweather_gui_get_widget(gui, "tabs"));
-       AWeatherView   *view    = aweather_gui_get_view(gui);
+       GtkWidget    *config  = aweather_gui_get_widget(gui, "tabs");
+       AWeatherView *view    = aweather_gui_get_view(gui);
 
        /* Add configuration tab */
        config_body = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(config_body), gtk_label_new("No radar loaded"));
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(config_body), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_notebook_prepend_page(GTK_NOTEBOOK(config), config_body, gtk_label_new("Radar"));
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(config_body),
+                       gtk_label_new("No radar loaded"));
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(config_body),
+                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_notebook_prepend_page(GTK_NOTEBOOK(config),
+                       config_body, gtk_label_new("Radar"));
 
        /* Set up OpenGL Stuff */
        g_signal_connect(drawing, "expose-event",     G_CALLBACK(expose),   NULL);

diff --git a/src/plugin-ridge.c b/src/plugin-ridge.c
index ea6068a8272726803f97a36ac53d2ead8f7b506e..9ab037f235174bd9a8498c734623f8423d3bbf92 100644 (file)
--- a/src/plugin-ridge.c
+++ b/src/plugin-ridge.c
@@ -43,11 +43,11 @@ typedef struct {
 } layer_t;
 
 static layer_t layers[] = {
-       [LAYER_TOPO]     = { "Topo",     "Overlays/" "Topo/"     "Short/" "%s_Topo_Short.jpg",     TRUE,  1, 0 },
-       [LAYER_COUNTY]   = { "Counties", "Overlays/" "County/"   "Short/" "%s_County_Short.gif",   TRUE,  3, 0 },
-       [LAYER_RIVERS]   = { "Rivers",   "Overlays/" "Rivers/"   "Short/" "%s_Rivers_Short.gif",   FALSE, 4, 0 },
-       [LAYER_HIGHWAYS] = { "Highways", "Overlays/" "Highways/" "Short/" "%s_Highways_Short.gif", TRUE,  5, 0 },
-       [LAYER_CITY]     = { "Cities",   "Overlays/" "Cities/"   "Short/" "%s_City_Short.gif",     TRUE,  6, 0 },
+       [LAYER_TOPO]     = {"Topo",     "Overlays/Topo/Short/%s_Topo_Short.jpg",         TRUE,  1, 0},
+       [LAYER_COUNTY]   = {"Counties", "Overlays/County/Short/%s_County_Short.gif",     TRUE,  3, 0},
+       [LAYER_RIVERS]   = {"Rivers",   "Overlays/Rivers/Short/%s_Rivers_Short.gif",     FALSE, 4, 0},
+       [LAYER_HIGHWAYS] = {"Highways", "Overlays/Highways/Short/%s_Highways_Short.gif", TRUE,  5, 0},
+       [LAYER_CITY]     = {"Cities",   "Overlays/Cities/Short/%s_City_Short.gif",       TRUE,  6, 0},
 };
 
 static AWeatherGui *gui = NULL;