Fix build with GTK 3

[aweather] / src / main.c

diff --git a/src/main.c b/src/main.c
index e1272013abe1fcee5342e19de40c3a1c5075705b..26fe2b84614db095121dfa1be36743a0f2deae72 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -51,11 +51,13 @@ static void log_func(const gchar *log_domain, GLogLevelFlags log_level,
        }
 }
 
+#if ! GTK_CHECK_VERSION(3,0,0)
 static void xdg_open(GtkWidget *widget, const gchar *link, gpointer user_data)
 {
        gchar *argv[] = {"xdg-open", (gchar*)link, NULL};
        g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
 }
+#endif
 
 static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 {
@@ -144,7 +146,6 @@ int main(int argc, char *argv[])
 
        /* Init */
        GError *error = NULL;
-       gdk_threads_init();
        if (!gtk_init_with_args(&argc, &argv, "aweather", entries, NULL, &error)) {
                g_print("%s\n", error->message);
                g_error_free(error);
@@ -152,16 +153,17 @@ int main(int argc, char *argv[])
        }
 
        /* Use external handler for link buttons */
+#if ! GTK_CHECK_VERSION(3,0,0)
        gtk_link_button_set_uri_hook((GtkLinkButtonUriFunc)xdg_open, NULL, NULL);
        gtk_about_dialog_set_url_hook((GtkAboutDialogActivateLinkFunc)xdg_open, NULL, NULL);
        gtk_about_dialog_set_email_hook((GtkAboutDialogActivateLinkFunc)xdg_open, NULL, NULL);
+#endif
 
        /* Setup debug level for aweather_gui_new */
        g_log_set_handler(NULL, G_LOG_LEVEL_MASK, log_func, NULL);
        log_levels = int2log(opt_debug >= 0 ? opt_debug : debug);
 
        /* Set up AWeather */
-       gdk_threads_enter();
        /* Pre-load some types for gtkbuilder */
        GRITS_TYPE_OPENGL;
        AWEATHER_TYPE_GUI;
@@ -200,7 +202,6 @@ int main(int argc, char *argv[])
        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());
+       //gdk_display_close(gdk_display_get_default());
        return 0;
 }