callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

immodule: Remove unused parameter

Browse Source
This commit is contained in:
Benjamin Otte
2015-08-18 20:45:34 +02:00
parent 8ed4e439e4
commit c6219c913f
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkimmodule.c
View File

@ -792,7 +792,6 @@ get_current_input_language (void)
/** /**
* _gtk_im_module_get_default_context_id: * _gtk_im_module_get_default_context_id:
* @client_window: a window
* *
* Return the context_id of the best IM context type * Return the context_id of the best IM context type
* for the given window. * for the given window.
@ -800,7 +799,7 @@ get_current_input_language (void)
* Returns: the context ID (will never be %NULL) * Returns: the context ID (will never be %NULL)
*/ */
const gchar * const gchar *
_gtk_im_module_get_default_context_id (GdkWindow *client_window) _gtk_im_module_get_default_context_id (void)
{ {
GSList *tmp_list; GSList *tmp_list;
const gchar *context_id = NULL; const gchar *context_id = NULL;

2
gtk/gtkimmoduleprivate.h
View File

@ -27,7 +27,7 @@ G_BEGIN_DECLS
void _gtk_im_module_list (const GtkIMContextInfo ***contexts, void _gtk_im_module_list (const GtkIMContextInfo ***contexts,
guint *n_contexts); guint *n_contexts);
GtkIMContext * _gtk_im_module_create (const gchar *context_id); GtkIMContext * _gtk_im_module_create (const gchar *context_id);
const gchar * _gtk_im_module_get_default_context_id (GdkWindow *client_window); const gchar * _gtk_im_module_get_default_context_id (void);
G_END_DECLS G_END_DECLS

4
gtk/gtkimmulticontext.c
View File

@ -251,7 +251,7 @@ get_effective_context_id (GtkIMMulticontext *multicontext)
return priv->context_id_aux; return priv->context_id_aux;
if (!global_context_id) if (!global_context_id)
global_context_id = _gtk_im_module_get_default_context_id (priv->client_window); global_context_id = _gtk_im_module_get_default_context_id ();
return global_context_id; return global_context_id;
} }
@ -605,7 +605,7 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
GtkWidget *menuitem, *system_menuitem; GtkWidget *menuitem, *system_menuitem;
const char *system_context_id; const char *system_context_id;
system_context_id = _gtk_im_module_get_default_context_id (priv->client_window); system_context_id = _gtk_im_module_get_default_context_id ();
system_menuitem = menuitem = gtk_radio_menu_item_new_with_label (group, C_("input method menu", "System")); system_menuitem = menuitem = gtk_radio_menu_item_new_with_label (group, C_("input method menu", "System"));
if (!priv->context_id_aux) if (!priv->context_id_aux)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE);