Commit e3e126ae authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

modules/input/gtkimcontextime.c modules/input/gtkimcontextmultipress.c use

2008-08-11  Sven Neumann  <sven@gimp.org>

	* modules/input/gtkimcontextime.c
	* modules/input/gtkimcontextmultipress.c
	* modules/input/gtkimcontextxim.c: use canonical signal names.


svn path=/trunk/; revision=21070
parent 4c33ae06
2008-08-11 Sven Neumann <sven@gimp.org>
* modules/input/gtkimcontextime.c
* modules/input/gtkimcontextmultipress.c
* modules/input/gtkimcontextxim.c: use canonical signal names.
2008-08-11 Sven Neumann <sven@gimp.org>
* gtk/gtkdnd-quartz.c
......
......@@ -353,7 +353,7 @@ gtk_im_context_ime_reset (GtkIMContext *context)
ImmNotifyIME (himc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
context_ime->preediting = FALSE;
g_signal_emit_by_name (context, "preedit_changed");
g_signal_emit_by_name (context, "preedit-changed");
ImmReleaseContext (hwnd, himc);
}
......@@ -946,7 +946,7 @@ gtk_im_context_ime_message_filter (GdkXEvent *xevent,
ImmSetCandidateWindow (himc, &cf);
if ((msg->lParam & GCS_COMPSTR))
g_signal_emit_by_name (context, "preedit_changed");
g_signal_emit_by_name (context, "preedit-changed");
if (msg->lParam & GCS_RESULTSTR)
{
......@@ -985,15 +985,15 @@ gtk_im_context_ime_message_filter (GdkXEvent *xevent,
case WM_IME_STARTCOMPOSITION:
context_ime->preediting = TRUE;
gtk_im_context_ime_set_cursor_location (context, NULL);
g_signal_emit_by_name (context, "preedit_start");
g_signal_emit_by_name (context, "preedit-start");
if (context_ime->use_preedit)
retval = TRUE;
break;
case WM_IME_ENDCOMPOSITION:
context_ime->preediting = FALSE;
g_signal_emit_by_name (context, "preedit_changed");
g_signal_emit_by_name (context, "preedit_end");
g_signal_emit_by_name (context, "preedit-changed");
g_signal_emit_by_name (context, "preedit-end");
if (context_ime->use_preedit)
retval = TRUE;
break;
......
......@@ -282,7 +282,7 @@ accept_character (GtkImContextMultipress *multipress_context, const gchar* chara
/* We must also signal that the preedit has changed, or we will still see the old
preedit from the composing of the character that we just committed, hanging around after the cursor.
*/
g_signal_emit_by_name (multipress_context, "preedit_changed");
g_signal_emit_by_name (multipress_context, "preedit-changed");
/* Provide a character to GTK+: */
g_signal_emit_by_name (multipress_context, "commit", characters);
......@@ -370,7 +370,7 @@ vfunc_filter_keypress (GtkIMContext *context, GdkEventKey *event)
* This will cause our vfunc_get_preedit_string() vfunc to be called,
* which will provide the current possible character for the user to see.
*/
g_signal_emit_by_name (multipress_context, "preedit_changed");
g_signal_emit_by_name (multipress_context, "preedit-changed");
/* Cancel any outstanding timeout, so we can start the timer again: */
cancel_automatic_timeout_commit (multipress_context);
......
......@@ -622,7 +622,7 @@ reinitialize_ic (GtkIMContextXIM *context_xim)
{
context_xim->preedit_length = 0;
if (!context_xim->finalizing)
g_signal_emit_by_name (context_xim, "preedit_changed");
g_signal_emit_by_name (context_xim, "preedit-changed");
}
}
/*
......@@ -930,7 +930,7 @@ gtk_im_context_xim_reset (GtkIMContext *context)
if (context_xim->preedit_length)
{
context_xim->preedit_length = 0;
g_signal_emit_by_name (context, "preedit_changed");
g_signal_emit_by_name (context, "preedit-changed");
}
XFree (result);
......@@ -1032,7 +1032,7 @@ preedit_start_callback (XIC xic,
GtkIMContextXIM *context_xim = GTK_IM_CONTEXT_XIM (context);
if (!context_xim->finalizing)
g_signal_emit_by_name (context, "preedit_start");
g_signal_emit_by_name (context, "preedit-start");
return -1; /* No length limit */
}
......@@ -1049,11 +1049,11 @@ preedit_done_callback (XIC xic,
{
context_xim->preedit_length = 0;
if (!context_xim->finalizing)
g_signal_emit_by_name (context_xim, "preedit_changed");
g_signal_emit_by_name (context_xim, "preedit-changed");
}
if (!context_xim->finalizing)
g_signal_emit_by_name (context, "preedit_end");
g_signal_emit_by_name (context, "preedit-end");
}
static gint
......@@ -1178,7 +1178,7 @@ preedit_draw_callback (XIC xic,
g_free (new_text);
if (!context->finalizing)
g_signal_emit_by_name (context, "preedit_changed");
g_signal_emit_by_name (context, "preedit-changed");
}
......@@ -1193,7 +1193,7 @@ preedit_caret_callback (XIC xic,
{
context->preedit_cursor = call_data->position;
if (!context->finalizing)
g_signal_emit_by_name (context, "preedit_changed");
g_signal_emit_by_name (context, "preedit-changed");
}
else
{
......@@ -1754,7 +1754,7 @@ status_window_get (GtkWidget *toplevel)
g_signal_connect (toplevel, "destroy",
G_CALLBACK (on_status_toplevel_destroy),
status_window);
g_signal_connect (toplevel, "configure_event",
g_signal_connect (toplevel, "configure-event",
G_CALLBACK (on_status_toplevel_configure),
status_window);
g_signal_connect (toplevel, "notify::screen",
......@@ -1822,11 +1822,11 @@ status_window_make_window (StatusWindow *status_window)
gtk_misc_set_padding (GTK_MISC (status_label), 1, 1);
gtk_widget_show (status_label);
g_signal_connect (window, "style_set",
g_signal_connect (window, "style-set",
G_CALLBACK (on_status_window_style_set), status_label);
gtk_container_add (GTK_CONTAINER (window), status_label);
g_signal_connect (window, "expose_event",
g_signal_connect (window, "expose-event",
G_CALLBACK (on_status_window_expose_event), NULL);
gtk_window_set_screen (GTK_WINDOW (status_window->window),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment