Gwyn Ciesla
5 years ago
parent
ec98cd4071
commit
d0947aabee
@ -1,27 +1,11 @@
|
||||
From: Will Thompson <wjt@endlessm.com>
|
||||
Date: Fri, 4 Aug 2017 15:20:07 +0100
|
||||
Subject: [PATCH] gtk: use com.transmissionbt.Transmission.* D-Bus names
|
||||
--- gtk/main.c~ 2020-05-22 06:04:23.000000000 -0500
|
||||
+++ gtk/main.c 2020-07-02 08:50:35.087089387 -0500
|
||||
@@ -675,7 +675,7 @@
|
||||
|
||||
Using the com.transmissionbt.Transmission. namespace (with a capital T)
|
||||
is consistent with the Qt frontend using
|
||||
com.transmissionbt.Transmission, and with standard D-Bus naming
|
||||
conventions.
|
||||
---
|
||||
gtk/main.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/main.c b/gtk/main.c
|
||||
index a164ab439..9fa2690b5 100644
|
||||
--- gtk/main.c
|
||||
+++ gtk/main.c
|
||||
@@ -680,7 +680,7 @@ int main(int argc, char** argv)
|
||||
|
||||
/* init the application for the specified config dir */
|
||||
stat (cbdata.config_dir, &sb);
|
||||
- application_id = g_strdup_printf ("com.transmissionbt.transmission_%lu_%lu", (unsigned long)sb.st_dev, (unsigned long)sb.st_ino);
|
||||
+ application_id = g_strdup_printf ("com.transmissionbt.Transmission._%lu_%lu", (unsigned long)sb.st_dev, (unsigned long)sb.st_ino);
|
||||
app = gtk_application_new (application_id, G_APPLICATION_HANDLES_OPEN);
|
||||
g_signal_connect (app, "open", G_CALLBACK (on_open), &cbdata);
|
||||
g_signal_connect (app, "startup", G_CALLBACK (on_startup), &cbdata);
|
||||
--
|
||||
2.13.3
|
||||
/* init the application for the specified config dir */
|
||||
stat(cbdata.config_dir, &sb);
|
||||
- application_id = g_strdup_printf("com.transmissionbt.transmission_%lu_%lu", (unsigned long)sb.st_dev,
|
||||
+ application_id = g_strdup_printf("com.transmissionbt.Transmission._%lu_%lu", (unsigned long)sb.st_dev,
|
||||
(unsigned long)sb.st_ino);
|
||||
app = gtk_application_new(application_id, G_APPLICATION_HANDLES_OPEN);
|
||||
g_signal_connect(app, "open", G_CALLBACK(on_open), &cbdata);
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
--- libtransmission/variant.c~ 2018-05-01 12:21:08.000000000 -0500
|
||||
+++ libtransmission/variant.c 2020-05-18 10:21:27.554214128 -0500
|
||||
@@ -820,7 +820,7 @@
|
||||
struct SaveNode
|
||||
{
|
||||
const tr_variant * v;
|
||||
- tr_variant sorted;
|
||||
+ tr_variant* sorted;
|
||||
size_t childIndex;
|
||||
bool isVisited;
|
||||
};
|
||||
@@ -849,26 +849,33 @@
|
||||
|
||||
qsort (tmp, n, sizeof (struct KeyIndex), compareKeyIndex);
|
||||
|
||||
- tr_variantInitDict (&node->sorted, n);
|
||||
+ node->sorted = tr_new(tr_variant, 1);
|
||||
+ tr_variantInitDict (node->sorted, n);
|
||||
for (i=0; i<n; ++i)
|
||||
- node->sorted.val.l.vals[i] = *tmp[i].val;
|
||||
+ node->sorted->val.l.vals[i] = *tmp[i].val;
|
||||
node->sorted.val.l.count = n;
|
||||
|
||||
tr_free (tmp);
|
||||
|
||||
- node->v = &node->sorted;
|
||||
+ v = node->sorted;
|
||||
}
|
||||
else
|
||||
{
|
||||
- node->v = v;
|
||||
+ node->sorted = NULL;
|
||||
}
|
||||
+
|
||||
+ node->v = v;
|
||||
}
|
||||
|
||||
static void
|
||||
nodeDestruct (struct SaveNode * node)
|
||||
{
|
||||
- if (node->v == &node->sorted)
|
||||
- tr_free (node->sorted.val.l.vals);
|
||||
+ //TR_ASSERT(node != NULL);
|
||||
+ if (node->sorted != NULL)
|
||||
+ {
|
||||
+ tr_free(node->sorted->val.l.vals);
|
||||
+ tr_free(node->sorted);
|
||||
+ }
|
||||
}
|
||||
|
||||
/**
|
||||
--- libtransmission/variant.c~ 2020-05-18 10:21:49.000000000 -0500
|
||||
+++ libtransmission/variant.c 2020-05-18 10:24:34.673648865 -0500
|
||||
@@ -853,7 +853,7 @@
|
||||
tr_variantInitDict (node->sorted, n);
|
||||
for (i=0; i<n; ++i)
|
||||
node->sorted->val.l.vals[i] = *tmp[i].val;
|
||||
- node->sorted.val.l.count = n;
|
||||
+ node->sorted->val.l.count = n;
|
||||
|
||||
tr_free (tmp);
|
||||
|
||||
@ -1 +1 @@
|
||||
SHA512 (transmission-2.94.tar.xz) = ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
|
||||
SHA512 (transmission-3.00.tar.xz) = eeaf7fe46797326190008776a7fa641b6341c806b0f1684c2e7326c1284832a320440013e42a37acda9fd0ee5dca695f215d6263c8acb39188c5d9a836104a61
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
diff -up ./configure.orig ./configure
|
||||
--- ./configure.orig 2016-03-06 23:24:37.116078717 +0300
|
||||
+++ ./configure 2017-04-13 23:25:44.643463654 +0300
|
||||
@@ -19160,12 +19160,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
pkg_cv_SYSTEMD_DAEMON_CFLAGS="$SYSTEMD_DAEMON_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
|
||||
+ pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -19178,12 +19178,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
pkg_cv_SYSTEMD_DAEMON_LIBS="$SYSTEMD_DAEMON_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
|
||||
+ pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -19202,9 +19202,9 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
- SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsystemd-daemon"`
|
||||
+ SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsystemd"`
|
||||
else
|
||||
- SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsystemd-daemon"`
|
||||
+ SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsystemd"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5
|
||||
Loading…
Reference in new issue