Fix build with GTK 3

[aweather] / src / main.c

diff --git a/src/main.c b/src/main.c
index c3d046943e20af5f52b4d20e7395d63e29767283..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,
        }
 }
 
-static void xdg_open(GtkLinkButton *button, const gchar *link, gpointer user_data)
+#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)
 {
@@ -99,12 +101,12 @@ 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);
+       GtkosxApplication *app = g_object_new(GTKOSX_TYPE_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)
+       gtkosx_application_set_menu_bar(app, GTK_MENU_SHELL(menu));
+       gtkosx_application_set_use_quartz_accelerators(app, TRUE);
+       gtkosx_application_ready(app);
+       //gtkosx_application_sync_menubar(app)
 #endif
 }
 
@@ -144,8 +146,6 @@ int main(int argc, char *argv[])
 
        /* Init */
        GError *error = NULL;
-       g_thread_init(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);
@@ -153,14 +153,17 @@ int main(int argc, char *argv[])
        }
 
        /* Use external handler for link buttons */
-       gtk_link_button_set_uri_hook(xdg_open, NULL, NULL);
+#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;
@@ -199,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;
 }