Update for libgis

[aweather] / src / main.c

diff --git a/src/main.c b/src/main.c
index 35a6ffb8646832c255630e2f4e79be36a1499176..83517e11e575822de0cfd9e547c8f0f3fc68e7a4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 
-#include <gis/gis.h>
+#include <gis.h>
 
 #include "aweather-gui.h"
 
@@ -82,22 +82,21 @@ int main(int argc, char *argv[])
        /* Set up AWeather */
        AWeatherGui *gui    = aweather_gui_new();
 
-       gint     prefs_debug   = gis_prefs_get_integer(gui->prefs, "aweather/log_level");
-       gchar   *prefs_site    = gis_prefs_get_string(gui->prefs,  "aweather/initial_site");
-       gboolean prefs_offline = gis_prefs_get_boolean(gui->prefs, "gis/offline");
+       gint     prefs_debug   = gis_prefs_get_integer(gui->prefs, "aweather/log_level", NULL);
+       gchar   *prefs_site    = gis_prefs_get_string(gui->prefs,  "aweather/initial_site", NULL);
+       gboolean prefs_offline = gis_prefs_get_boolean(gui->prefs, "gis/offline", NULL);
 
        debug   = (opt_debug   ?: prefs_debug   ?: debug);
        site    = (opt_site    ?: prefs_site    ?: site);
        offline = (opt_offline ?: prefs_offline ?: offline);
 
-       gis_world_set_offline(gui->world, offline);
+       gis_viewer_set_offline(gui->viewer, offline);
        log_levels = (1 << (debug+1))-1;
 
-       GObject *action = aweather_gui_get_object(gui, "log_level");
+       GObject *action = aweather_gui_get_object(gui, "prefs_general_log");
        g_signal_connect(action, "changed", G_CALLBACK(on_log_level_changed), NULL);
 
        gtk_widget_show_all(GTK_WIDGET(gui));
-       gis_view_set_site(gui->view, site);
        gtk_main();
        return 0;
 }