From: Andy Spencer <andy753421@gmail.com>
Date: Mon, 21 Jan 2013 05:20:17 +0000 (+0000)
Subject: Fix build with GTK 3
X-Git-Url: http://pileus.org/git/?p=aweather;a=commitdiff_plain;h=274a83a00dae79b7d1927210e51214422e77d0d5;hp=9e734911e96ae83b0f41afa5073d5313bc197d96

Fix build with GTK 3

This mostly just comments out some deprecated functions. They're not
particularly necessary so, but it would be good to find replacements
eventually.
---

diff --git a/src/main.c b/src/main.c
index b22ae8e..26fe2b8 100644
--- 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)
 {
@@ -151,9 +153,11 @@ 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);
diff --git a/src/plugins/gps-plugin.c b/src/plugins/gps-plugin.c
index b3feefe..d162cfd 100644
--- a/src/plugins/gps-plugin.c
+++ b/src/plugins/gps-plugin.c
@@ -821,9 +821,11 @@ static void gps_init_track_log_frame(GritsPluginGps *gps, GtkWidget *gbox)
 	gtk_range_set_increments(
 	            GTK_RANGE(gps->ui.gps_log_interval_slider),
 	            10.0 /* step */, 30.0 /* page up/down */);
+#if ! GTK_CHECK_VERSION(3,0,0)
 	gtk_range_set_update_policy(
 	            GTK_RANGE(gps->ui.gps_log_interval_slider),
 	            GTK_UPDATE_DELAYED);
+#endif
 	gtk_box_pack_start(GTK_BOX(ubox), gps->ui.gps_log_interval_slider,
 	            TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(lbox), ubox, FALSE, FALSE, 0);