mirror of
https://github.com/transmission/transmission
synced 2024-12-23 16:24:02 +00:00
* better `info' icon for torrent inspector.
* fix internal.h ifdefs s.t. we can use openssl for SHA1 when using configure.ac
This commit is contained in:
parent
609f2c8a89
commit
9542f7fe9e
2 changed files with 4 additions and 4 deletions
|
@ -27,7 +27,7 @@ static void action_cb ( GtkAction * a, gpointer user_data )
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !GTK_CHECK_VERSION(2,8,0)
|
#if !GTK_CHECK_VERSION(2,8,0)
|
||||||
#define GTK_STOCK_INFO NULL
|
#define GTK_STOCK_INFO GTK_STOCK_PROPERTIES
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static GtkRadioActionEntry priority_toggle_entries[] =
|
static GtkRadioActionEntry priority_toggle_entries[] =
|
||||||
|
@ -70,11 +70,11 @@ static GtkActionEntry entries[] =
|
||||||
N_("_Quit"), "<control>Q", NULL, G_CALLBACK(action_cb) },
|
N_("_Quit"), "<control>Q", NULL, G_CALLBACK(action_cb) },
|
||||||
{ "edit-preferences", GTK_STOCK_PREFERENCES,
|
{ "edit-preferences", GTK_STOCK_PREFERENCES,
|
||||||
N_("Edit _Preferences"), NULL, NULL, G_CALLBACK(action_cb) },
|
N_("Edit _Preferences"), NULL, NULL, G_CALLBACK(action_cb) },
|
||||||
{ "show-torrent-inspector", GTK_STOCK_PROPERTIES,
|
{ "show-torrent-inspector", GTK_STOCK_INFO,
|
||||||
N_("_Torrent Info"), NULL, NULL, G_CALLBACK(action_cb) },
|
N_("_Torrent Info"), NULL, NULL, G_CALLBACK(action_cb) },
|
||||||
{ "show-about-dialog", GTK_STOCK_ABOUT,
|
{ "show-about-dialog", GTK_STOCK_ABOUT,
|
||||||
N_("_About Transmission"), NULL, NULL, G_CALLBACK(action_cb) },
|
N_("_About Transmission"), NULL, NULL, G_CALLBACK(action_cb) },
|
||||||
{ "show-debug-window", GTK_STOCK_INFO,
|
{ "show-debug-window", NULL,
|
||||||
N_("Show _Debug Window"), NULL, NULL, G_CALLBACK(action_cb) },
|
N_("Show _Debug Window"), NULL, NULL, G_CALLBACK(action_cb) },
|
||||||
{ "toggle-main-window", "ICON_TRANSMISSION",
|
{ "toggle-main-window", "ICON_TRANSMISSION",
|
||||||
N_("Show / Hide _Transmission"), NULL, NULL, G_CALLBACK(action_cb) }
|
N_("Show / Hide _Transmission"), NULL, NULL, G_CALLBACK(action_cb) }
|
||||||
|
|
|
@ -71,7 +71,7 @@ int vasprintf( char **, const char *, va_list );
|
||||||
/* We use OpenSSL whenever possible, since it is likely to be more
|
/* We use OpenSSL whenever possible, since it is likely to be more
|
||||||
optimized and it is ok to use it with a MIT-licensed application.
|
optimized and it is ok to use it with a MIT-licensed application.
|
||||||
Otherwise, we use the included implementation by vi@nwr.jp. */
|
Otherwise, we use the included implementation by vi@nwr.jp. */
|
||||||
#ifdef HAVE_OPENSSL
|
#if defined(HAVE_OPENSSL) || defined(HAVE_LIBSSL)
|
||||||
# undef SHA_DIGEST_LENGTH
|
# undef SHA_DIGEST_LENGTH
|
||||||
# include <openssl/sha.h>
|
# include <openssl/sha.h>
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in a new issue