s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to disconnect signal handlers on dispose.

Browse Source
This commit is contained in:
Daiki Ueno
2011-02-01 12:13:26 +09:00
parent 30d88ceb78
commit aed12cd831
6 changed files with 94 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
eek/eek-gtk-keyboard.c
View File

@ -57,6 +57,9 @@ struct _EekGtkKeyboardPrivate
EekRenderer *renderer;
EekKeyboard *keyboard;
EekKey *dragged_key;
gulong key_pressed_handler;
gulong key_released_handler;
gulong symbol_index_changed_handler;
};
static EekColor * color_from_gdk_color (GdkColor *gdk_color);
@ -206,12 +209,15 @@ eek_gtk_keyboard_set_keyboard (EekGtkKeyboard *self,
EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
priv->keyboard = g_object_ref (keyboard);
g_signal_connect (priv->keyboard, "key-pressed",
G_CALLBACK(on_key_pressed), self);
g_signal_connect (priv->keyboard, "key-released",
G_CALLBACK(on_key_released), self);
g_signal_connect (priv->keyboard, "symbol-index-changed",
G_CALLBACK(on_symbol_index_changed), self);
priv->key_pressed_handler =
g_signal_connect (priv->keyboard, "key-pressed",
G_CALLBACK(on_key_pressed), self);
priv->key_released_handler =
g_signal_connect (priv->keyboard, "key-released",
G_CALLBACK(on_key_released), self);
priv->symbol_index_changed_handler =
g_signal_connect (priv->keyboard, "symbol-index-changed",
G_CALLBACK(on_symbol_index_changed), self);
}
static void
@ -246,6 +252,19 @@ eek_gtk_keyboard_dispose (GObject *object)
}
if (priv->keyboard) {
if (g_signal_handler_is_connected (priv->keyboard,
priv->key_pressed_handler))
g_signal_handler_disconnect (priv->keyboard,
priv->key_pressed_handler);
if (g_signal_handler_is_connected (priv->keyboard,
priv->key_released_handler))
g_signal_handler_disconnect (priv->keyboard,
priv->key_released_handler);
if (g_signal_handler_is_connected (priv->keyboard,
priv->symbol_index_changed_handler))
g_signal_handler_disconnect (priv->keyboard,
priv->symbol_index_changed_handler);
g_object_unref (priv->keyboard);
priv->keyboard = NULL;
}

14
eek/eek-renderer.c
View File

@ -53,6 +53,7 @@ struct _EekRendererPrivate
PangoFontDescription *font;
GHashTable *outline_surface_cache;
cairo_surface_t *keyboard_surface;
gulong symbol_index_changed_handler;
};
struct {
@ -536,9 +537,10 @@ eek_renderer_set_property (GObject *object,
priv->keyboard = g_value_get_object (value);
g_object_ref (priv->keyboard);
g_signal_connect (priv->keyboard, "symbol-index-changed",
G_CALLBACK(on_symbol_index_changed),
object);
priv->symbol_index_changed_handler =
g_signal_connect (priv->keyboard, "symbol-index-changed",
G_CALLBACK(on_symbol_index_changed),
object);
break;
case PROP_PCONTEXT:
priv->pcontext = g_value_get_object (value);
@ -553,6 +555,10 @@ eek_renderer_dispose (GObject *object)
EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);
if (priv->keyboard) {
if (g_signal_handler_is_connected (priv->keyboard,
priv->symbol_index_changed_handler))
g_signal_handler_disconnect (priv->keyboard,
priv->symbol_index_changed_handler);
g_object_unref (priv->keyboard);
priv->keyboard = NULL;
}
@ -571,7 +577,6 @@ static void
eek_renderer_finalize (GObject *object)
{
EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);
g_hash_table_destroy (priv->outline_surface_cache);
G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object);
}
@ -638,6 +643,7 @@ eek_renderer_init (EekRenderer *self)
NULL,
free_surface);
priv->keyboard_surface = NULL;
priv->symbol_index_changed_handler = 0;
}
static void