summaryrefslogtreecommitdiff
path: root/gsearchtool/src/gsearchtool.c
diff options
context:
space:
mode:
Diffstat (limited to 'gsearchtool/src/gsearchtool.c')
-rw-r--r--gsearchtool/src/gsearchtool.c67
1 files changed, 0 insertions, 67 deletions
diff --git a/gsearchtool/src/gsearchtool.c b/gsearchtool/src/gsearchtool.c
index 8b42b662..eeae2ecd 100644
--- a/gsearchtool/src/gsearchtool.c
+++ b/gsearchtool/src/gsearchtool.c
@@ -1738,11 +1738,7 @@ handle_search_command_stderr_io (GIOChannel * ioc,
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (3, 0, 0)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#else
- hbox = gtk_hbox_new (FALSE, 0);
-#endif
spacer = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
@@ -1786,11 +1782,7 @@ handle_search_command_stderr_io (GIOChannel * ioc,
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-#if GTK_CHECK_VERSION (3, 0, 0)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#else
- hbox = gtk_hbox_new (FALSE, 0);
-#endif
spacer = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
@@ -1964,11 +1956,7 @@ create_constraint_box (GSearchWindow * gsearch,
GtkWidget * entry_hbox;
GtkWidget * button;
-#if GTK_CHECK_VERSION (3, 0, 0)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#else
- hbox = gtk_hbox_new (FALSE, 12);
-#endif
switch (GSearchOptionTemplates[opt->constraint_id].type) {
case SEARCH_CONSTRAINT_TYPE_BOOLEAN:
@@ -2044,11 +2032,7 @@ create_constraint_box (GSearchWindow * gsearch,
(gpointer) gsearch);
/* add text field */
-#if GTK_CHECK_VERSION (3, 0, 0)
entry_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#else
- entry_hbox = gtk_hbox_new (FALSE, 6);
-#endif
gtk_box_pack_start (GTK_BOX (hbox), entry_hbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (entry_hbox), entry, TRUE, TRUE, 0);
@@ -2175,13 +2159,8 @@ create_additional_constraint_section (GSearchWindow * gsearch)
GtkWidget * hbox;
gchar * desc;
-#if GTK_CHECK_VERSION (3, 0, 0)
gsearch->available_options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#else
- gsearch->available_options_vbox = gtk_vbox_new (FALSE, 6);
- hbox = gtk_hbox_new (FALSE, 12);
-#endif
gtk_box_pack_end (GTK_BOX (gsearch->available_options_vbox), hbox, FALSE, FALSE, 0);
@@ -2312,13 +2291,8 @@ create_search_results_section (GSearchWindow * gsearch)
GtkTreeViewColumn * column;
GtkCellRenderer * renderer;
-#if GTK_CHECK_VERSION (3, 0, 0)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#else
- vbox = gtk_vbox_new (FALSE, 6);
- hbox = gtk_hbox_new (FALSE, 6);
-#endif
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@@ -2362,9 +2336,6 @@ create_search_results_section (GSearchWindow * gsearch)
gtk_tree_view_set_headers_visible (gsearch->search_results_tree_view, FALSE);
gtk_tree_view_set_search_equal_func (gsearch->search_results_tree_view,
gsearch_equal_func, NULL, NULL);
-#if !GTK_CHECK_VERSION (3, 14, 0)
- gtk_tree_view_set_rules_hint (gsearch->search_results_tree_view, TRUE);
-#endif
g_object_unref (G_OBJECT (gsearch->search_results_list_store));
if (gsearch->is_window_accessible) {
@@ -2812,51 +2783,29 @@ gsearch_app_create (GSearchWindow * gsearch)
gtk_window_maximize (GTK_WINDOW (gsearch->window));
}
-#if GTK_CHECK_VERSION (3, 0, 0)
container = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#else
- container = gtk_vbox_new (FALSE, 6);
-#endif
gtk_container_add (GTK_CONTAINER (gsearch->window), container);
gtk_container_set_border_width (GTK_CONTAINER (container), 12);
-#if GTK_CHECK_VERSION (3, 0, 0)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#else
- hbox = gtk_hbox_new (FALSE, 6);
-#endif
gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION (3, 0, 0)
gsearch->name_and_folder_table = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (gsearch->name_and_folder_table), 6);
gtk_grid_set_column_spacing (GTK_GRID (gsearch->name_and_folder_table), 12);
-#else
- gsearch->name_and_folder_table = gtk_table_new (2, 2, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (gsearch->name_and_folder_table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (gsearch->name_and_folder_table), 12);
-#endif
gtk_container_add (GTK_CONTAINER (hbox), gsearch->name_and_folder_table);
label = gtk_label_new_with_mnemonic (_("_Name contains:"));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
g_object_set (G_OBJECT (label), "xalign", 0.0, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_grid_attach (GTK_GRID (gsearch->name_and_folder_table), label, 0, 0, 1, 1);
-#else
- gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 1);
-#endif
gsearch->name_contains_entry = gsearch_history_entry_new ("gsearchtool-file-entry", FALSE);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), gsearch->name_contains_entry);
gsearch_history_entry_set_history_length (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry), 10);
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_hexpand (gsearch->name_contains_entry, TRUE);
gtk_grid_attach (GTK_GRID (gsearch->name_and_folder_table), gsearch->name_contains_entry, 1, 0, 1, 1);
-#else
- gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), gsearch->name_contains_entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);
-#endif
entry = gsearch_history_entry_get_entry (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry));
if (GTK_IS_ACCESSIBLE (gtk_widget_get_accessible (gsearch->name_contains_entry))) {
@@ -2872,20 +2821,12 @@ gsearch_app_create (GSearchWindow * gsearch)
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
g_object_set (G_OBJECT (label), "xalign", 0.0, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_grid_attach (GTK_GRID (gsearch->name_and_folder_table), label, 0, 1, 1, 1);
-#else
- gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
-#endif
gsearch->look_in_folder_button = gtk_file_chooser_button_new (_("Browse"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (gsearch->look_in_folder_button));
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_hexpand (gsearch->look_in_folder_button, TRUE);
gtk_grid_attach (GTK_GRID (gsearch->name_and_folder_table), gsearch->look_in_folder_button, 1, 1, 1, 1);
-#else
- gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), gsearch->look_in_folder_button, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);
-#endif
g_signal_connect (G_OBJECT (gsearch->look_in_folder_button), "current-folder-changed",
G_CALLBACK (look_in_folder_changed_cb),
@@ -2924,22 +2865,14 @@ gsearch_app_create (GSearchWindow * gsearch)
add_atk_relation (GTK_WIDGET (gsearch->show_more_options_expander), GTK_WIDGET (gsearch->available_options_vbox), ATK_RELATION_CONTROLLER_FOR);
}
-#if GTK_CHECK_VERSION (3, 0, 0)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-#else
- vbox = gtk_vbox_new (FALSE, 12);
-#endif
gtk_box_pack_start (GTK_BOX (container), vbox, TRUE, TRUE, 0);
gsearch->search_results_vbox = create_search_results_section (gsearch);
gtk_widget_set_sensitive (GTK_WIDGET (gsearch->search_results_vbox), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), gsearch->search_results_vbox, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION (3, 0, 0)
hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-#else
- hbox = gtk_hbutton_box_new ();
-#endif
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_END);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 09:23:59 +0000