[gtk/arnaudb/requires: 1/4] Drop “gtk+” plus sign in GtkBuilder <requires>.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/arnaudb/requires: 1/4] Drop “gtk+” plus sign in GtkBuilder <requires>.
- Date: Sat, 7 Nov 2020 15:22:23 +0000 (UTC)
commit db6d7dccd8e9b58b21b7e16ee0fc4b27831a6b4a
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Sat Nov 7 11:03:52 2020 +0100
Drop “gtk+” plus sign in GtkBuilder <requires>.
demos/gtk-demo/blendmodes.ui | 2 +-
demos/gtk-demo/filtermodel.ui | 2 +-
demos/gtk-demo/font-features.ui | 2 +-
gtk/gtkbuilder.c | 2 +-
gtk/gtkbuilderparser.c | 2 +-
gtk/ui/gtkplacesview.ui | 2 +-
gtk/ui/gtkplacesviewrow.ui | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui
index 5826f41d44..47af972b88 100644
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk" version="3.20"/>
<object class="GtkWindow" id="window">
<property name="resizable">0</property>
<property name="title">CSS Blend Modes</property>
diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui
index 2f1f00fcb1..9a5912053d 100644
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="3.16"/>
+ <requires lib="gtk" version="3.16"/>
<object class="GtkListStore" id="liststore1">
<columns>
<column type="gint"/>
diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui
index 1099cd08d0..81438c4281 100644
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk" version="3.12"/>
<object class="GtkWindow" id="window">
<property name="default-width">600</property>
<property name="default-height">500</property>
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index b6663126cf..ef1237fccc 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -71,7 +71,7 @@
* element contains an `<object>` element which describes the child object.
* The target toolkit version(s) are described by <requires> elements,
* the “lib” attribute specifies the widget library in question (currently
- * the only supported value is “gtk+”) and the “version” attribute specifies
+ * the only supported value is “gtk”) and the “version” attribute specifies
* the target version in the form “`<major>`.`<minor>`”. The builder will error
* out if the version requirements are not met.
*
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 66ff6981a7..c8e096aacb 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -2014,7 +2014,7 @@ end_element (GtkBuildableParseContext *context,
* required versions, possibly throw a signal allowing them
* to check their library versions here.
*/
- if (!strcmp (req_info->library, "gtk+"))
+ if (!strcmp (req_info->library, "gtk"))
{
if (!GTK_CHECK_VERSION (req_info->major, req_info->minor, 0))
{
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 98460819b1..e15cf294ca 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
- <requires lib="gtk+" version="3.16"/>
+ <requires lib="gtk" version="3.16"/>
<object class="GtkListStore" id="completion_store">
<columns>
<column type="gchararray"/>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 915d20a189..e3e34adf1f 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
- <requires lib="gtk+" version="3.16"/>
+ <requires lib="gtk" version="3.16"/>
<template class="GtkPlacesViewRow" parent="GtkListBoxRow">
<property name="width-request">100</property>
<property name="child">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]