Update the comment icons and tooltips.

[metze/wireshark/wip.git] / version_info.c

diff --git a/version_info.c b/version_info.c
index 381c1a4b75a3bd526bb2346d27fbc145d50da8d4..51ae5dd95ad8d8226e30ec32e64ed24c31be31f5 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -167,11 +167,9 @@ typedef void (WINAPI *nativesi_func_ptr)(LPSYSTEM_INFO);
 #endif
 
 /*
- * Get various library run-time versions, and the OS version, and append
- * them to the specified GString.
+ * Get the OS version, and append it to the GString
  */
-void
-get_runtime_version_info(GString *str, void (*additional_info)(GString *))
+void get_os_version_info(GString *str)
 {
 #if defined(_WIN32)
        OSVERSIONINFOEX info;
@@ -183,11 +181,6 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
 #if HAVE_OS_X_FRAMEWORKS
        SInt32 macosx_ver, macosx_major_ver, macosx_minor_ver, macosx_bugfix_ver;
 #endif
-#ifndef _WIN32
-       gchar *lang;
-#endif
-
-       g_string_append(str, "on ");
 
 #if defined(_WIN32)
        /*
@@ -469,6 +462,23 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
 #else
        g_string_append(str, "an unknown OS");
 #endif
+}
+
+
+/*
+ * Get various library run-time versions, and the OS version, and append
+ * them to the specified GString.
+ */
+void
+get_runtime_version_info(GString *str, void (*additional_info)(GString *))
+{
+#ifndef _WIN32
+       gchar *lang;
+#endif
+
+       g_string_append(str, "on ");
+
+       get_os_version_info(str);
 
 #ifndef _WIN32
        /* Locale */
@@ -580,7 +590,7 @@ const char *
 get_copyright_info(void)
 {
        return
-"Copyright 1998-2011 Gerald Combs <gerald@wireshark.org> and contributors.\n"
+"Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
 }