summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cut-n-paste/smclient/eggdesktopfile.c8
-rw-r--r--cut-n-paste/smclient/eggsmclient-xsmp.c4
-rw-r--r--cut-n-paste/toolbar-editor/egg-editable-toolbar.c21
-rw-r--r--shell/ev-annotation-properties-dialog.c3
-rw-r--r--shell/ev-password-view.c3
-rw-r--r--shell/ev-properties-dialog.c3
-rw-r--r--shell/ev-window.c3
7 files changed, 0 insertions, 45 deletions
diff --git a/cut-n-paste/smclient/eggdesktopfile.c b/cut-n-paste/smclient/eggdesktopfile.c
index 1f432adc..d50a1bcf 100644
--- a/cut-n-paste/smclient/eggdesktopfile.c
+++ b/cut-n-paste/smclient/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/cut-n-paste/smclient/eggsmclient-xsmp.c b/cut-n-paste/smclient/eggsmclient-xsmp.c
index 8d6e9f7c..78ecbaea 100644
--- a/cut-n-paste/smclient/eggsmclient-xsmp.c
+++ b/cut-n-paste/smclient/eggsmclient-xsmp.c
@@ -369,11 +369,7 @@ sm_client_xsmp_startup (EggSMClient *client,
free (ret_client_id);
gdk_threads_enter ();
-#if GTK_CHECK_VERSION (2, 24, 0)
gdk_x11_set_sm_client_id (xsmp->client_id);
-#else
- gdk_set_sm_client_id (xsmp->client_id);
-#endif
gdk_threads_leave ();
g_debug ("Got client ID \"%s\"", xsmp->client_id);
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index bd66f6c6..c290ef56 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -202,11 +202,7 @@ drag_begin_cb (GtkWidget *widget,
gtk_widget_hide (widget);
-#if GTK_CHECK_VERSION (2, 16, 0)
action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget));
-#else
- action = gtk_widget_get_action (widget);
-#endif
if (action == NULL) return;
@@ -233,11 +229,7 @@ drag_end_cb (GtkWidget *widget,
{
gtk_widget_show (widget);
-#if GTK_CHECK_VERSION (2, 16, 0)
action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget));
-#else
- action = gtk_widget_get_action (widget);
-#endif
if (action == NULL) return;
@@ -547,11 +539,7 @@ configure_item_tooltip (GtkToolItem *item)
{
GtkAction *action;
-#if GTK_CHECK_VERSION (2, 16, 0)
action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (item));
-#else
- action = gtk_widget_get_action (GTK_WIDGET (item));
-#endif
if (action != NULL)
{
@@ -922,11 +910,7 @@ toolbar_visibility_refresh (EggEditableToolbar *etoolbar)
priv->visibility_id = gtk_ui_manager_new_merge_id (priv->manager);
-#if GTK_CHECK_VERSION(2,20,0)
showing = gtk_widget_get_visible (GTK_WIDGET (etoolbar));
-#else
- showing = GTK_WIDGET_VISIBLE (etoolbar);
-#endif
n_toolbars = egg_toolbars_model_n_toolbars (priv->model);
for (i = 0; i < n_toolbars; i++)
@@ -1008,13 +992,8 @@ toolbar_visibility_refresh (EggEditableToolbar *etoolbar)
gtk_action_set_visible (GTK_ACTION (action), (egg_toolbars_model_get_flags (priv->model, i)
& EGG_TB_MODEL_NOT_REMOVABLE) == 0);
gtk_action_set_sensitive (GTK_ACTION (action), showing);
-#if GTK_CHECK_VERSION(2,20,0)
gtk_toggle_action_set_active (action, gtk_widget_get_visible
(get_dock_nth (etoolbar, i)));
-#else
- gtk_toggle_action_set_active (action, GTK_WIDGET_VISIBLE
- (get_dock_nth (etoolbar, i)));
-#endif
for (list = priv->visibility_paths; list != NULL; list = g_list_next (list))
{
diff --git a/shell/ev-annotation-properties-dialog.c b/shell/ev-annotation-properties-dialog.c
index 40f8a972..81c1fd95 100644
--- a/shell/ev-annotation-properties-dialog.c
+++ b/shell/ev-annotation-properties-dialog.c
@@ -139,9 +139,6 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog
gtk_window_set_title (GTK_WINDOW (annot_dialog), _("Annotation Properties"));
gtk_window_set_destroy_with_parent (GTK_WINDOW (annot_dialog), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (annot_dialog), 5);
-#if !GTK_CHECK_VERSION (3, 0, 0)
- gtk_dialog_set_has_separator (dialog, FALSE);
-#endif
gtk_dialog_add_buttons (dialog,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c
index b6ead823..4b81ed2b 100644
--- a/shell/ev-password-view.c
+++ b/shell/ev-password-view.c
@@ -255,9 +255,6 @@ ev_password_view_ask_password (EvPasswordView *password_view)
action_area = gtk_dialog_get_action_area (dialog);
/* Set the dialog up with HIG properties */
-#if !GTK_CHECK_VERSION (3, 0, 0)
- gtk_dialog_set_has_separator (dialog, FALSE);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
diff --git a/shell/ev-properties-dialog.c b/shell/ev-properties-dialog.c
index cefedbd6..03430759 100644
--- a/shell/ev-properties-dialog.c
+++ b/shell/ev-properties-dialog.c
@@ -61,9 +61,6 @@ ev_properties_dialog_init (EvPropertiesDialog *properties)
gtk_window_set_title (GTK_WINDOW (properties), _("Properties"));
gtk_window_set_destroy_with_parent (GTK_WINDOW (properties), TRUE);
-#if !GTK_CHECK_VERSION (3, 0, 0)
- gtk_dialog_set_has_separator (GTK_DIALOG (properties), FALSE);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (properties), 5);
gtk_box_set_spacing (content_area, 2);
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 2a3189d3..58985c03 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -4333,9 +4333,6 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5);
gtk_box_set_spacing (GTK_BOX (content_area), 2);
-#if !GTK_CHECK_VERSION (3, 0, 0)
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-#endif
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
toolbar = EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar);
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-02 23:06:51 +0000