diff options
-rw-r--r-- | gtk/main.c | 6 | ||||
-rw-r--r-- | gtk/u3.c | 34 | ||||
-rw-r--r-- | gtk/u3.h | 2 |
3 files changed, 42 insertions, 0 deletions
diff --git a/gtk/main.c b/gtk/main.c index ca7abdee60..09d156db84 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2062,6 +2062,12 @@ get_gui_runtime_info(GString *str g_string_append(str, ", "); get_runtime_airpcap_version(str); #endif + + if(u3_active()) { + g_string_append(str, ", "); + u3_runtime_info(str); + } + } /* And now our feature presentation... [ fade to music ] */ @@ -72,6 +72,40 @@ gboolean u3_active() } +void u3_runtime_info(GString *str) +{ + + char *u3devicepath = NULL; + char *u3deviceproduct = NULL; + + if((u3deviceproduct = +#ifdef _WIN32 + getenv_utf8 +#else + getenv +#endif + ("U3_DEVICE_PRODUCT")) != NULL) { + g_string_append(str, " from the "); + g_string_append(str, u3deviceproduct); + } else { + g_string_append(str, " from a "); + } + + g_string_append(str, " U3 device"); + + if((u3devicepath = +#ifdef _WIN32 + getenv_utf8 +#else + getenv +#endif + ("U3_DEVICE_PATH")) != NULL) { + g_string_append(str, " in drive "); + g_string_append(str, u3devicepath); + } + +} + void u3_register_pid() { int pid; @@ -24,6 +24,8 @@ gboolean u3_active(); +void u3_runtime_info(GString *str); + void u3_register_pid(void); void u3_deregister_pid(void); |