[gspell] language-choosers: accept NULL language to pick the default language
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gspell] language-choosers: accept NULL language to pick the default language
- Date: Thu, 14 Jan 2016 13:55:48 +0000 (UTC)
commit 5398f9bcfd2e268f09f6a407bae2c9b55cd38742
Author: Sébastien Wilmet <swilmet gnome org>
Date: Thu Jan 14 14:10:51 2016 +0100
language-choosers: accept NULL language to pick the default language
gspell/gspell-language-chooser-button.c | 10 ++++++++--
gspell/gspell-language-chooser-dialog.c | 10 ++++++++--
gspell/gspell-language-chooser.c | 5 +++--
3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/gspell/gspell-language-chooser-button.c b/gspell/gspell-language-chooser-button.c
index bc7b4bd..76b222f 100644
--- a/gspell/gspell-language-chooser-button.c
+++ b/gspell/gspell-language-chooser-button.c
@@ -1,7 +1,7 @@
/*
* This file is part of gspell, a spell-checking library.
*
- * Copyright 2015 - Sébastien Wilmet <swilmet gnome org>
+ * Copyright 2015, 2016 - Sébastien Wilmet <swilmet gnome org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -99,6 +99,11 @@ gspell_language_chooser_button_set_language (GspellLanguageChooser *chooser,
button = GSPELL_LANGUAGE_CHOOSER_BUTTON (chooser);
priv = gspell_language_chooser_button_get_instance_private (button);
+ if (language == NULL)
+ {
+ language = gspell_language_get_default ();
+ }
+
if (priv->language != language)
{
priv->language = language;
@@ -270,7 +275,8 @@ gspell_language_chooser_button_init (GspellLanguageChooserButton *button)
/**
* gspell_language_chooser_button_new:
- * @current_language: a #GspellLanguage.
+ * @current_language: (nullable): a #GspellLanguage, or %NULL to pick the
+ * default language.
*
* Returns: a new #GspellLanguageChooserButton widget.
*/
diff --git a/gspell/gspell-language-chooser-dialog.c b/gspell/gspell-language-chooser-dialog.c
index 8b86c79..6a36844 100644
--- a/gspell/gspell-language-chooser-dialog.c
+++ b/gspell/gspell-language-chooser-dialog.c
@@ -2,7 +2,7 @@
* This file is part of gspell, a spell-checking library.
*
* Copyright 2002 - Paolo Maggi
- * Copyright 2015 - Sébastien Wilmet
+ * Copyright 2015, 2016 - Sébastien Wilmet
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -118,6 +118,11 @@ gspell_language_chooser_dialog_set_language (GspellLanguageChooser *chooser,
dialog = GSPELL_LANGUAGE_CHOOSER_DIALOG (chooser);
priv = gspell_language_chooser_dialog_get_instance_private (dialog);
+ if (language == NULL)
+ {
+ language = gspell_language_get_default ();
+ }
+
selection = gtk_tree_view_get_selection (priv->treeview);
if (language == NULL)
@@ -389,7 +394,8 @@ gspell_language_chooser_dialog_init (GspellLanguageChooserDialog *dialog)
/**
* gspell_language_chooser_dialog_new:
* @parent: transient parent of the dialog.
- * @current_language: the #GspellLanguage to select initially.
+ * @current_language: (nullable): the #GspellLanguage to select initially, or
+ * %NULL to pick the default language.
* @flags: #GtkDialogFlags
*
* Returns: a new #GspellLanguageChooserDialog widget.
diff --git a/gspell/gspell-language-chooser.c b/gspell/gspell-language-chooser.c
index b09dbd5..eeaf3ee 100644
--- a/gspell/gspell-language-chooser.c
+++ b/gspell/gspell-language-chooser.c
@@ -1,7 +1,7 @@
/*
* This file is part of gspell, a spell-checking library.
*
- * Copyright 2015 - Sébastien Wilmet <swilmet gnome org>
+ * Copyright 2015, 2016 - Sébastien Wilmet <swilmet gnome org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -65,7 +65,8 @@ gspell_language_chooser_get_language (GspellLanguageChooser *chooser)
/**
* gspell_language_chooser_set_language:
* @chooser: a #GspellLanguageChooser.
- * @language: a #GspellLanguage.
+ * @language: (nullable): a #GspellLanguage or %NULL to pick the default
+ * language.
*
* Sets the selected language.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]