X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=2ac6a0f82e130adde8d7d3989f3c905ae0636203;hb=81922a41721f8e7ec02186235edc1769e06f6b2c;hp=cb8568e5711d4811ae3c867d0a0348e365a35fe0;hpb=4ee3ef055348ac38562d425cf972091b2c2bc589;p=aweather

diff --git a/src/main.c b/src/main.c
index cb8568e..2ac6a0f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,20 @@ static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 	log_levels = (1 << (value+1))-1;
 }
 
+gboolean set_location(gpointer _gui)
+{
+	AWeatherGui *gui = _gui;
+	gchar *site = g_object_get_data(G_OBJECT(gui), "site");
+	for (city_t *city = cities; city->type; city++) {
+		if (city->type == LOCATION_CITY && g_str_equal(city->code, site)) {
+			gis_viewer_set_location(gui->viewer,
+				city->pos.lat, city->pos.lon, EARTH_R/25);
+			break;
+		}
+	}
+	return FALSE;
+}
+
 
 /********
  * Main *
@@ -54,7 +68,7 @@ int main(int argc, char *argv[])
 {
 	/* Defaults */
 	gint     debug   = 6;
-	gchar   *site    = "KIND";
+	gchar   *site    = "";
 	gboolean offline = FALSE;
 
 	/* Arguments */
@@ -89,7 +103,14 @@ int main(int argc, char *argv[])
 
 	/* Set up AWeather */
 	gdk_threads_enter();
-	AWeatherGui *gui = aweather_gui_new();
+	/* Pre-load some type for gtkbuilder */
+	GIS_TYPE_OPENGL;
+	AWEATHER_TYPE_GUI;
+	GtkBuilder *builder = gtk_builder_new();
+	if (!gtk_builder_add_from_file(builder, PKGDATADIR "/main.ui", &error))
+		g_error("Failed to create gtk builder: %s", error->message);
+	AWeatherGui *gui = AWEATHER_GUI(gtk_builder_get_object(builder, "main_window"));
+	g_signal_connect(gui, "destroy", gtk_main_quit, NULL);
 
 	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);
@@ -105,16 +126,12 @@ int main(int argc, char *argv[])
 	GObject *action = aweather_gui_get_object(gui, "prefs_general_log");
 	g_signal_connect(action, "changed", G_CALLBACK(on_log_level_changed), NULL);
 
-	/* set locaiton */
-	for (city_t *city = cities; city->type; city++)
-		if (city->type == LOCATION_CITY && g_str_equal(city->code, site)) {
-			gis_viewer_set_location(gui->viewer,
-				city->pos.lat, city->pos.lon, EARTH_R/25);
-			break;
-		}
+	g_object_set_data(G_OBJECT(gui), "site", site);
+	g_idle_add(set_location, gui);
 
 	gtk_widget_show_all(GTK_WIDGET(gui));
 	gtk_main();
 	gdk_threads_leave();
+	gdk_display_close(gdk_display_get_default());
 	return 0;
 }