summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--baobab/src/baobab-chart.c2
-rw-r--r--gsearchtool/gsearchtool-callbacks.c6
-rw-r--r--libeggsmclient/eggdesktopfile.c8
-rw-r--r--libeggsmclient/eggsmclient-xsmp.c1
4 files changed, 1 insertions, 16 deletions
diff --git a/baobab/src/baobab-chart.c b/baobab/src/baobab-chart.c
index 2aaedfe2..d22bffb5 100644
--- a/baobab/src/baobab-chart.c
+++ b/baobab/src/baobab-chart.c
@@ -1787,9 +1787,7 @@ baobab_chart_save_snapshot (GtkWidget *chart)
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fs_dlg),
g_get_home_dir ());
-#if GTK_CHECK_VERSION(2,8,0)
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fs_dlg), TRUE);
-#endif
/* extra widget */
vbox = gtk_vbox_new (FALSE, 0);
diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c
index 6699a3b6..a14c4896 100644
--- a/gsearchtool/gsearchtool-callbacks.c
+++ b/gsearchtool/gsearchtool-callbacks.c
@@ -1620,9 +1620,7 @@ show_file_selector_cb (GtkAction * action,
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
NULL);
-#if GTK_CHECK_VERSION(2,7,3)
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (file_chooser), TRUE);
-#endif
if (gsearch->save_results_as_default_filename != NULL) {
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_chooser),
gsearch->save_results_as_default_filename);
@@ -1698,7 +1696,6 @@ display_dialog_could_not_save_to (GtkWidget * window,
g_free (primary);
}
-#if !GTK_CHECK_VERSION(2,7,3)
static gint
display_dialog_could_not_save_exists (GtkWidget * window,
const gchar * file)
@@ -1743,7 +1740,6 @@ display_dialog_could_not_save_exists (GtkWidget * window,
return response;
}
-#endif
void
save_results_cb (GtkWidget * chooser,
@@ -1783,7 +1779,6 @@ save_results_cb (GtkWidget * chooser,
return;
}
-#if !GTK_CHECK_VERSION(2,7,3)
if (g_file_test (gsearch->save_results_as_default_filename, G_FILE_TEST_EXISTS)) {
gint response;
@@ -1795,7 +1790,6 @@ save_results_cb (GtkWidget * chooser,
return;
}
}
-#endif
if ((fp = fopen (gsearch->save_results_as_default_filename, "w")) != NULL) {
diff --git a/libeggsmclient/eggdesktopfile.c b/libeggsmclient/eggdesktopfile.c
index 5ecf831d..a96e5bd7 100644
--- a/libeggsmclient/eggdesktopfile.c
+++ b/libeggsmclient/eggdesktopfile.c
@@ -909,7 +909,6 @@ parse_link (EggDesktopFile *desktop_file,
return TRUE;
}
-#if GTK_CHECK_VERSION (2, 12, 0)
static char *
start_startup_notification (GdkDisplay *display,
EggDesktopFile *desktop_file,
@@ -1020,7 +1019,6 @@ set_startup_notification_timeout (GdkDisplay *display,
g_timeout_add_seconds (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH,
startup_notification_timeout, sn_data);
}
-#endif /* GTK 2.12 */
static GPtrArray *
array_putenv (GPtrArray *env, char *variable)
@@ -1207,7 +1205,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file,
}
g_free (command);
-#if GTK_CHECK_VERSION (2, 12, 0)
startup_id = start_startup_notification (display, desktop_file,
argv[0], screen_num,
workspace, launch_time);
@@ -1218,9 +1215,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file,
env = array_putenv (env, startup_id_env);
g_free (startup_id_env);
}
-#else
- startup_id = NULL;
-#endif /* GTK 2.12 */
if (env != NULL)
g_ptr_array_add (env, NULL);
@@ -1238,7 +1232,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file,
if (startup_id)
{
-#if GTK_CHECK_VERSION (2, 12, 0)
if (current_success)
{
set_startup_notification_timeout (display, startup_id);
@@ -1249,7 +1242,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file,
g_free (startup_id);
}
else
-#endif /* GTK 2.12 */
g_free (startup_id);
}
else if (ret_startup_id)
diff --git a/libeggsmclient/eggsmclient-xsmp.c b/libeggsmclient/eggsmclient-xsmp.c
index 7e0a1911..9ea00c28 100644
--- a/libeggsmclient/eggsmclient-xsmp.c
+++ b/libeggsmclient/eggsmclient-xsmp.c
@@ -36,6 +36,7 @@
#include <X11/SM/SMlib.h>
#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
#define EGG_TYPE_SM_CLIENT_XSMP (egg_sm_client_xsmp_get_type ())
#define EGG_SM_CLIENT_XSMP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP))