projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the new g_strv_contains
[platform/upstream/glib.git]
/
gio
/
gdbusaddress.c
diff --git
a/gio/gdbusaddress.c
b/gio/gdbusaddress.c
index
ef807f6
..
6d17b7c
100644
(file)
--- a/
gio/gdbusaddress.c
+++ b/
gio/gdbusaddress.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
*
* Author: David Zeuthen <davidz@redhat.com>
*/
@@
-62,7
+60,7
@@
*
* Routines for working with D-Bus addresses. A D-Bus address is a string
* like "unix:tmpdir=/tmp/my-app-name". The exact format of addresses
*
* Routines for working with D-Bus addresses. A D-Bus address is a string
* like "unix:tmpdir=/tmp/my-app-name". The exact format of addresses
- * is explained in detail in the
<link linkend="http://dbus.freedesktop.org/doc/dbus-specification.html#addresses">D-Bus specification</link>
.
+ * is explained in detail in the
[D-Bus specification](http://dbus.freedesktop.org/doc/dbus-specification.html\#addresses)
.
*/
static gchar *get_session_address_platform_specific (GError **error);
*/
static gchar *get_session_address_platform_specific (GError **error);
@@
-1454,15
+1452,16
@@
get_session_address_platform_specific (GError **error)
/**
* g_dbus_address_get_for_bus_sync:
/**
* g_dbus_address_get_for_bus_sync:
- * @bus_type:
A #GBusType.
- * @cancellable: (allow-none):
A #GCancellable or %NULL.
- * @error:
Return location for error or %NULL.
+ * @bus_type:
a #GBusType
+ * @cancellable: (allow-none):
a #GCancellable or %NULL
+ * @error:
return location for error or %NULL
*
* Synchronously looks up the D-Bus address for the well-known message
* bus instance specified by @bus_type. This may involve using various
* platform specific mechanisms.
*
*
* Synchronously looks up the D-Bus address for the well-known message
* bus instance specified by @bus_type. This may involve using various
* platform specific mechanisms.
*
- * Returns: A valid D-Bus address string for @bus_type or %NULL if @error is set.
+ * Returns: a valid D-Bus address string for @bus_type or %NULL if
+ * @error is set
*
* Since: 2.26
*/
*
* Since: 2.26
*/
@@
-1596,18
+1595,18
@@
g_dbus_address_get_for_bus_sync (GBusType bus_type,
/**
* g_dbus_address_escape_value:
* @string: an unescaped string to be included in a D-Bus address
/**
* g_dbus_address_escape_value:
* @string: an unescaped string to be included in a D-Bus address
- * as the value in a key-value pair
+ *
as the value in a key-value pair
*
* Escape @string so it can appear in a D-Bus address as the value
* part of a key-value pair.
*
*
* Escape @string so it can appear in a D-Bus address as the value
* part of a key-value pair.
*
- * For instance, if @string is
<code>/run/bus-for-:0</code>
,
- * this function would return
<code>/run/bus-for-%3A0</code>
,
+ * For instance, if @string is
"/run/bus-for-:0"
,
+ * this function would return
"/run/bus-for-%3A0"
,
* which could be used in a D-Bus address like
* which could be used in a D-Bus address like
- *
<code>unix:nonce-tcp:host=127.0.0.1,port=42,noncefile=/run/bus-for-%3A0</code>
.
+ *
"unix:nonce-tcp:host=127.0.0.1,port=42,noncefile=/run/bus-for-%3A0"
.
*
* Returns: (transfer full): a copy of @string with all
*
* Returns: (transfer full): a copy of @string with all
- * non-optionally-escaped bytes escaped
+ *
non-optionally-escaped bytes escaped
*
* Since: 2.36
*/
*
* Since: 2.36
*/