diff options
Diffstat (limited to 'mate-panel/drawer.c')
| -rw-r--r-- | mate-panel/drawer.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/mate-panel/drawer.c b/mate-panel/drawer.c index 40251bf1..03d6bd5f 100644 --- a/mate-panel/drawer.c +++ b/mate-panel/drawer.c @@ -1,13 +1,13 @@ /* * MATE panel drawer module. * (C) 1997 The Free Software Foundation + * Copyright (C) 2012-2021 MATE Developers * * Authors: Miguel de Icaza * Federico Mena * George Lebl */ - #include <config.h> #include <stdio.h> #include <sys/types.h> @@ -34,11 +34,9 @@ #include "panel-icon-names.h" #include "panel-schemas.h" - /* Internal functions */ /* event handlers */ - static void drawer_click (GtkWidget *widget, Drawer *drawer) @@ -445,18 +443,16 @@ create_drawer_applet (PanelToplevel *toplevel, set_tooltip_and_name (drawer, tooltip); g_signal_connect (drawer->button, "clicked", G_CALLBACK (drawer_click), drawer); - g_signal_connect (drawer->button, "key_press_event", G_CALLBACK (key_press_drawer), drawer); - g_signal_connect (drawer->toplevel, "key_press_event", G_CALLBACK (key_press_drawer_widget), drawer); - + g_signal_connect (drawer->button, "key-press-event", G_CALLBACK (key_press_drawer), drawer); + g_signal_connect (drawer->toplevel, "key-press-event", G_CALLBACK (key_press_drawer_widget), drawer); gtk_drag_dest_set (drawer->button, 0, NULL, 0, 0); - g_signal_connect (drawer->button, "drag_data_get", G_CALLBACK (drag_data_get_cb), drawer); - g_signal_connect (drawer->button, "drag_motion", G_CALLBACK (drag_motion_cb), drawer); - g_signal_connect (drawer->button, "drag_drop", G_CALLBACK (drag_drop_cb), drawer); - g_signal_connect (drawer->button, "drag_data_received", G_CALLBACK (drag_data_received_cb), drawer); - g_signal_connect (drawer->button, "drag_leave", G_CALLBACK (drag_leave_cb), drawer); - + g_signal_connect (drawer->button, "drag-data-get", G_CALLBACK (drag_data_get_cb), drawer); + g_signal_connect (drawer->button, "drag-motion", G_CALLBACK (drag_motion_cb), drawer); + g_signal_connect (drawer->button, "drag-drop", G_CALLBACK (drag_drop_cb), drawer); + g_signal_connect (drawer->button, "drag-data-received", G_CALLBACK (drag_data_received_cb), drawer); + g_signal_connect (drawer->button, "drag-leave", G_CALLBACK (drag_leave_cb), drawer); g_signal_connect (drawer->button, "destroy", G_CALLBACK (destroy_drawer), drawer); g_signal_connect (drawer->toplevel, "destroy", G_CALLBACK (toplevel_destroyed), drawer); @@ -538,7 +534,7 @@ load_drawer_applet (char *toplevel_id, return; } - g_signal_connect_after (drawer->button, "size_allocate", G_CALLBACK (drawer_button_size_allocated), drawer); + g_signal_connect_after (drawer->button, "size-allocate", G_CALLBACK (drawer_button_size_allocated), drawer); panel_widget_add_forbidden (panel_toplevel_get_panel_widget (drawer->toplevel)); panel_widget_set_applet_expandable (panel_widget, GTK_WIDGET (drawer->button), FALSE, TRUE); @@ -727,12 +723,8 @@ panel_drawer_set_dnd_enabled (Drawer *drawer, void drawer_query_deletion (Drawer *drawer) { - GtkWidget *dialog; - if (drawer->toplevel) { - PanelWidget *panel_widget; - - panel_widget = panel_toplevel_get_panel_widget (drawer->toplevel); + PanelWidget *panel_widget = panel_toplevel_get_panel_widget (drawer->toplevel); if (!panel_global_config_get_confirm_panel_remove () || !g_list_length (panel_widget->applet_list)) { @@ -740,7 +732,7 @@ drawer_query_deletion (Drawer *drawer) return; } - dialog = panel_deletion_dialog (drawer->toplevel); + GtkWidget *dialog = panel_deletion_dialog (drawer->toplevel); g_signal_connect (dialog, "response", G_CALLBACK (drawer_deletion_response), drawer); |