summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-23 08:04:23 +0100
committerinfirit <[email protected]>2014-11-23 08:04:23 +0100
commitc73f7aa7c5af707cd6d99984a1a8e0d120ad50fb (patch)
tree886dda2f599feb3096a8cf482b4242608f40e0d7
parent91ae83fa5dce263b568909cbe143fa4f833057c8 (diff)
downloadmate-panel-c73f7aa7c5af707cd6d99984a1a8e0d120ad50fb.tar.bz2
mate-panel-c73f7aa7c5af707cd6d99984a1a8e0d120ad50fb.tar.xz
Gtk3: panel-run-dialog: Use style-updated signal instead of style-set
Based on gnome-panel commit: b4deac9d217b4785d2c930a2deb2d94f5e4878d9 From: Carlos Garcia Campos <[email protected]>
-rw-r--r--mate-panel/panel-run-dialog.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c
index 51a6be7c..7e2f17ec 100644
--- a/mate-panel/panel-run-dialog.c
+++ b/mate-panel/panel-run-dialog.c
@@ -1821,9 +1821,14 @@ pixmap_drag_data_get (GtkWidget *run_dialog,
}
static void
+#if GTK_CHECK_VERSION (3, 0, 0)
+panel_run_dialog_style_updated (GtkWidget *widget,
+ PanelRunDialog *dialog)
+#else
panel_run_dialog_style_set (GtkWidget *widget,
GtkStyle *prev_style,
PanelRunDialog *dialog)
+#endif
{
if (dialog->icon) {
GIcon *icon;
@@ -1854,9 +1859,15 @@ panel_run_dialog_setup_pixmap (PanelRunDialog *dialog,
{
dialog->pixmap = PANEL_GTK_BUILDER_GET (gui, "icon_pixmap");
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_signal_connect (dialog->pixmap, "style-updated",
+ G_CALLBACK (panel_run_dialog_style_updated),
+ dialog);
+#else
g_signal_connect (dialog->pixmap, "style-set",
G_CALLBACK (panel_run_dialog_style_set),
dialog);
+#endif
g_signal_connect (dialog->pixmap, "screen-changed",
G_CALLBACK (panel_run_dialog_screen_changed),
dialog);
@@ -1917,9 +1928,15 @@ panel_run_dialog_new (GdkScreen *screen,
static void
panel_run_dialog_disconnect_pixmap (PanelRunDialog *dialog)
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_signal_handlers_disconnect_by_func (dialog->pixmap,
+ G_CALLBACK (panel_run_dialog_style_updated),
+ dialog);
+#else
g_signal_handlers_disconnect_by_func (dialog->pixmap,
G_CALLBACK (panel_run_dialog_style_set),
dialog);
+#endif
g_signal_handlers_disconnect_by_func (dialog->pixmap,
G_CALLBACK (panel_run_dialog_screen_changed),
dialog);