diff options
| author | Joakim Verona | 2012-07-27 02:22:03 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-07-27 02:22:03 +0200 |
| commit | 5fb63197843dcae66f2fe0ddd6f4a9d560e9db2f (patch) | |
| tree | 5c55f1096a656a9759f0b53a0b5d1a2289bd366f /src/dbusbind.c | |
| parent | 0c5c85cf2b350c965bb1ffa5b2d77c2adebc406b (diff) | |
| parent | 562157c814037dcba58a20cd6908a95992c22283 (diff) | |
| download | emacs-5fb63197843dcae66f2fe0ddd6f4a9d560e9db2f.tar.gz emacs-5fb63197843dcae66f2fe0ddd6f4a9d560e9db2f.zip | |
upstream
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index d80bb21cd59..86013d92c07 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -1712,7 +1712,7 @@ syms_of_dbusbind (void) | |||
| 1712 | Fput (Qdbus_error, Qerror_conditions, | 1712 | Fput (Qdbus_error, Qerror_conditions, |
| 1713 | list2 (Qdbus_error, Qerror)); | 1713 | list2 (Qdbus_error, Qerror)); |
| 1714 | Fput (Qdbus_error, Qerror_message, | 1714 | Fput (Qdbus_error, Qerror_message, |
| 1715 | make_pure_c_string ("D-Bus error")); | 1715 | build_pure_c_string ("D-Bus error")); |
| 1716 | 1716 | ||
| 1717 | DEFSYM (QCdbus_system_bus, ":system"); | 1717 | DEFSYM (QCdbus_system_bus, ":system"); |
| 1718 | DEFSYM (QCdbus_session_bus, ":session"); | 1718 | DEFSYM (QCdbus_session_bus, ":session"); |
| @@ -1744,7 +1744,7 @@ syms_of_dbusbind (void) | |||
| 1744 | Vdbus_compiled_version, | 1744 | Vdbus_compiled_version, |
| 1745 | doc: /* The version of D-Bus Emacs is compiled against. */); | 1745 | doc: /* The version of D-Bus Emacs is compiled against. */); |
| 1746 | #ifdef DBUS_VERSION_STRING | 1746 | #ifdef DBUS_VERSION_STRING |
| 1747 | Vdbus_compiled_version = make_pure_c_string (DBUS_VERSION_STRING); | 1747 | Vdbus_compiled_version = build_pure_c_string (DBUS_VERSION_STRING); |
| 1748 | #else | 1748 | #else |
| 1749 | Vdbus_compiled_version = Qnil; | 1749 | Vdbus_compiled_version = Qnil; |
| 1750 | #endif | 1750 | #endif |
| @@ -1757,8 +1757,8 @@ syms_of_dbusbind (void) | |||
| 1757 | int major, minor, micro; | 1757 | int major, minor, micro; |
| 1758 | char s[sizeof ".." + 3 * INT_STRLEN_BOUND (int)]; | 1758 | char s[sizeof ".." + 3 * INT_STRLEN_BOUND (int)]; |
| 1759 | dbus_get_version (&major, &minor, µ); | 1759 | dbus_get_version (&major, &minor, µ); |
| 1760 | sprintf (s, "%d.%d.%d", major, minor, micro); | 1760 | Vdbus_runtime_version |
| 1761 | Vdbus_runtime_version = build_string (s); | 1761 | = make_formatted_string (s, "%d.%d.%d", major, minor, micro); |
| 1762 | #else | 1762 | #else |
| 1763 | Vdbus_runtime_version = Qnil; | 1763 | Vdbus_runtime_version = Qnil; |
| 1764 | #endif | 1764 | #endif |