summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2013-07-30 20:55:17 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2013-07-30 20:55:44 +0200
commitf299e2512769030b76e6ef7662f95194b972450e (patch)
tree61ee9946027951e8e61fcaa6492df9d5fe2716a6
parentcf55433f17957c13fc4a345d52d708400215e192 (diff)
downloadgobject-introspection-f299e2512769030b76e6ef7662f95194b972450e.tar.gz
Update annotations from glib 2.37.5
-rw-r--r--gir/glib-2.0.c29
-rw-r--r--gir/gobject-2.0.c2
2 files changed, 18 insertions, 13 deletions
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 838f83c0..3e7f8b6e 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -19650,19 +19650,11 @@
* stops at the partial match.
* When both #G_REGEX_MATCH_PARTIAL_SOFT and #G_REGEX_MATCH_PARTIAL_HARD
* are set, the latter takes precedence.
- * See <ulink>man:pcrepartial</ulink> for more information on partial matching.
*
- * Because of the way certain internal optimizations are implemented
- * the partial matching algorithm cannot be used with all patterns.
- * So repeated single characters such as "a{2,4}" and repeated single
- * meta-sequences such as "\d+" are not permitted if the maximum number
- * of occurrences is greater than one. Optional items such as "\d?"
- * (where the maximum is one) are permitted. Quantifiers with any values
- * are permitted after parentheses, so the invalid examples above can be
- * coded thus "(a){2,4}" and "(\d)+". If #G_REGEX_MATCH_PARTIAL or
- * #G_REGEX_MATCH_PARTIAL_HARD is set
- * for a pattern that does not conform to the restrictions, matching
- * functions return an error.
+ * There were formerly some restrictions on the pattern for partial matching.
+ * The restrictions no longer apply.
+ *
+ * See <ulink>man:pcrepartial</ulink> for more information on partial matching.
*
* Returns: %TRUE if the match was partial, %FALSE otherwise
* Since: 2.14
@@ -22564,6 +22556,19 @@
/**
+ * g_regex_get_max_lookbehind:
+ * @regex: a #GRegex structure
+ *
+ * Gets the number of characters in the longest lookbehind assertion in the
+ * pattern. This information is useful when doing multi-segment matching using
+ * the partial matching facilities.
+ *
+ * Returns: the number of characters in the longest lookbehind assertion.
+ * Since: 2.38
+ */
+
+
+/**
* g_regex_get_pattern:
* @regex: a #GRegex structure
*
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index dab3e3e6..941b838d 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -4049,7 +4049,7 @@
*
* Overrides the class closure (i.e. the default handler) for the
* given signal for emissions on instances of @instance_type with
- * callabck @class_handler. @instance_type must be derived from the
+ * callback @class_handler. @instance_type must be derived from the
* type to which the signal belongs.
*
* See g_signal_chain_from_overridden() and