Add guards around initial date/time

[aweather] / src / main.c

diff --git a/src/main.c b/src/main.c
index 55d0ad94cc99ef79be4d88adb7fd283e60a44ae4..7ae60d8cd601595aba29d54eafc59ed29a22ed8e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -21,6 +21,10 @@
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
+#ifdef MAC_INTEGRATION
+#include <gtkosxapplication.h>
+#endif
+
 #include <grits.h>
 
 #include "aweather-gui.h"
@@ -64,19 +68,23 @@ static void set_location_time(AWeatherGui *gui, char *site, char *time)
        /* Set time
         *   Do this before setting setting location
         *   so that it doesn't refresh twice */
-       int year, mon, day, hour, min;
-       sscanf(time, "%d-%d-%d %d:%d", &year, &mon, &day, &hour, &min);
-       time_t sec = mktime(&(struct tm){0, year-1900, mon-1, day, hour, min});
-       if (sec > 0)
-               grits_viewer_set_time(gui->viewer, sec);
-       g_debug("date = [%s] == %lu\n", time, sec);
+       if (time) {
+               int year, mon, day, hour, min;
+               sscanf(time, "%d-%d-%d %d:%d", &year, &mon, &day, &hour, &min);
+               time_t sec = mktime(&(struct tm){0, year-1900, mon-1, day, hour, min});
+               if (sec > 0)
+                       grits_viewer_set_time(gui->viewer, sec);
+               g_debug("date = [%s] == %lu\n", time, sec);
+       }
 
        /* Set location */
-       for (city_t *city = cities; city->type; city++) {
-               if (city->type == LOCATION_CITY && g_str_equal(city->code, site)) {
-                       grits_viewer_set_location(gui->viewer,
-                               city->pos.lat, city->pos.lon, EARTH_R/35);
-                       break;
+       if (site) {
+               for (city_t *city = cities; city->type; city++) {
+                       if (city->type == LOCATION_CITY && g_str_equal(city->code, site)) {
+                               grits_viewer_set_location(gui->viewer,
+                                       city->pos.lat, city->pos.lon, EARTH_R/35);
+                               break;
+                       }
                }
        }
 }
@@ -87,6 +95,19 @@ static void set_toggle_action(AWeatherGui *gui, const char *action, gboolean ena
        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(object), enabled);
 }
 
+static void setup_mac(AWeatherGui *gui)
+{
+#ifdef MAC_INTEGRATION
+       GtkWidget *menu = aweather_gui_get_widget(gui, "main_menu");
+       GtkOSXApplication *app = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+       gtk_widget_hide(menu);
+       gtk_osxapplication_set_menu_bar(app, GTK_MENU_SHELL(menu));
+       gtk_osxapplication_set_use_quartz_accelerators(app, TRUE);
+       gtk_osxapplication_ready(app);
+       //gtk_osxapplication_sync_menubar(app)
+#endif
+}
+
 /********
  * Main *
  ********/
@@ -94,8 +115,8 @@ int main(int argc, char *argv[])
 {
        /* Defaults */
        gint     debug      = 2; // G_LOG_LEVEL_WARNING
-       gchar   *site       = "";
-       gchar   *time       = "";
+       gchar   *site       = NULL;
+       gchar   *time       = NULL;
        gboolean autoupdate = FALSE;
        gboolean offline    = FALSE;
        gboolean fullscreen = FALSE;
@@ -173,6 +194,7 @@ int main(int argc, char *argv[])
        /* Done with init, show gui */
        gtk_widget_show_all(GTK_WIDGET(gui));
        set_toggle_action(gui, "fullscreen", fullscreen); // Resest widget hiding
+       setup_mac(gui); // done after show_all
        gtk_main();
        gdk_threads_leave();
        gdk_display_close(gdk_display_get_default());