diff options
Diffstat (limited to 'gsearchtool/src/gsearchtool-callbacks.c')
-rw-r--r-- | gsearchtool/src/gsearchtool-callbacks.c | 74 |
1 files changed, 34 insertions, 40 deletions
diff --git a/gsearchtool/src/gsearchtool-callbacks.c b/gsearchtool/src/gsearchtool-callbacks.c index f5fd5414..737ca064 100644 --- a/gsearchtool/src/gsearchtool-callbacks.c +++ b/gsearchtool/src/gsearchtool-callbacks.c @@ -1,5 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* Copyright (C) 2002 the Free Software Foundation + * Copyright (C) 2012-2021 MATE Developers * * This file is part of MATE Utils. * @@ -196,9 +197,9 @@ click_help_cb (GtkWidget * widget, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); g_error_free (error); @@ -220,7 +221,7 @@ click_expander_cb (GObject * object, GDK_HINT_MIN_SIZE); } else { - GdkGeometry default_geometry = {MINIMUM_WINDOW_WIDTH, MINIMUM_WINDOW_HEIGHT}; + GdkGeometry default_geometry = { MINIMUM_WINDOW_WIDTH, MINIMUM_WINDOW_HEIGHT, 0, 0, 0, 0, 0, 0, 0.0, 0.0, 0 }; gtk_widget_hide (gsearch->available_options_vbox); gtk_window_set_geometry_hints (GTK_WINDOW (gsearch->window), @@ -328,7 +329,6 @@ look_in_folder_changed_cb (GtkWidget * widget, g_free (value); } - static gint display_dialog_file_open_limit (GtkWidget * window, gint count) @@ -403,9 +403,9 @@ display_dialog_could_not_open_file (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); g_free (primary); @@ -432,9 +432,9 @@ display_dialog_could_not_open_folder (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); g_free (primary); @@ -735,9 +735,9 @@ display_dialog_could_not_move_to_trash (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); g_free (primary); } @@ -813,9 +813,9 @@ display_dialog_could_not_delete (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); g_free (primary); } @@ -1143,8 +1143,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_container_add (GTK_CONTAINER (gsearch->search_results_popup_menu), new1); gtk_widget_show (new1); - g_signal_connect (G_OBJECT (new1), - "activate", + g_signal_connect (new1, "activate", G_CALLBACK (open_file_cb), (gpointer) gsearch); } @@ -1169,8 +1168,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_container_add (GTK_CONTAINER (gsearch->search_results_popup_menu), new1); gtk_widget_show (new1); - g_signal_connect (G_OBJECT (new1), - "activate", + g_signal_connect (new1, "activate", G_CALLBACK (open_file_cb), (gpointer) gsearch); } @@ -1257,7 +1255,8 @@ build_popup_menu_for_file (GSearchWindow * gsearch, on the parent menu item. Since submenus in gtk+ are automatically displayed when the user hovers over them, most will never click on the parent menu item. The work-around is to connect to "button-press-event". */ - g_signal_connect (G_OBJECT(new1), "button-press-event", G_CALLBACK (open_file_event_cb), + g_signal_connect (new1, "button-press-event", + G_CALLBACK (open_file_event_cb), (gpointer) gsearch); } else { @@ -1299,8 +1298,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_container_add (GTK_CONTAINER (gsearch->search_results_popup_menu), new1); gtk_widget_show (new1); - g_signal_connect (G_OBJECT (new1), - "activate", + g_signal_connect (new1, "activate", G_CALLBACK (open_folder_cb), (gpointer) gsearch); @@ -1310,8 +1308,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_container_add (GTK_CONTAINER (gsearch->search_results_popup_menu), new1); gtk_widget_show (new1); - g_signal_connect (G_OBJECT (new1), - "activate", + g_signal_connect (new1, "activate", G_CALLBACK (copy_path_cb), (gpointer) gsearch); } @@ -1330,8 +1327,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_container_add (GTK_CONTAINER (gsearch->search_results_popup_menu), new1); gtk_widget_show (new1); - g_signal_connect (G_OBJECT (new1), - "activate", + g_signal_connect (new1, "activate", G_CALLBACK (move_to_trash_cb), (gpointer) gsearch); @@ -1348,8 +1344,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_widget_set_sensitive (gsearch->search_results_save_results_as_item, FALSE); } - g_signal_connect (G_OBJECT (gsearch->search_results_save_results_as_item), - "activate", + g_signal_connect (gsearch->search_results_save_results_as_item, "activate", G_CALLBACK (show_file_selector_cb), (gpointer) gsearch); } @@ -1619,7 +1614,7 @@ drag_begin_file_cb (GtkWidget * widget, number_of_selected_rows = gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection)); if (number_of_selected_rows > 1) { - gtk_drag_set_icon_stock (context, "gtk-dnd-multiple", 0, 0); + gtk_drag_set_icon_name (context, "gtk-dnd-multiple", 0, 0); } else if (number_of_selected_rows == 1) { GdkPixbuf * pixbuf; @@ -1642,7 +1637,7 @@ drag_begin_file_cb (GtkWidget * widget, gtk_drag_set_icon_pixbuf (context, pixbuf, 0, 0); } else { - gtk_drag_set_icon_stock (context, "gtk-dnd", 0, 0); + gtk_drag_set_icon_name (context, "gtk-dnd", 0, 0); } } } @@ -1710,7 +1705,6 @@ drag_file_cb (GtkWidget * widget, g_free (uri_list); } - void show_file_selector_cb (GtkAction * action, gpointer data) @@ -1731,7 +1725,7 @@ show_file_selector_cb (GtkAction * action, gsearch->save_results_as_default_filename); } - g_signal_connect (G_OBJECT (file_chooser), "response", + g_signal_connect (file_chooser, "response", G_CALLBACK (save_results_cb), gsearch); gtk_window_set_modal (GTK_WINDOW (file_chooser), TRUE); @@ -1762,9 +1756,9 @@ display_dialog_could_not_save_no_name (GtkWidget * window) gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); g_free (primary); g_free (secondary); @@ -1794,9 +1788,9 @@ display_dialog_could_not_save_to (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); g_free (primary); } |