Remove deprecation notices

TigerVNC · Mar 20, 2024 · a11a90c · a11a90c
1 parent 79c97a6
commit a11a90c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 30 deletions.
diff --git a/common/os/os.cxx b/common/os/os.cxx
@@ -121,9 +121,3 @@ const char* os::getvncstatedir()
 {
   return getvncdir(false, "XDG_STATE_HOME", ".local/state");
 }
-
-/* deprecated */
-const char* os::getvnchomedir()
-{
-  return getvncdir(false, NULL, NULL);
-}
diff --git a/common/os/os.h b/common/os/os.h
@@ -51,17 +51,6 @@ namespace os {
    */
   const char* getvncstatedir();
 
-  /*
-   * Get legacy VNC home directory ($HOME/.vnc on Unix-likes).
-   * If HOME environment variable is set then it is used.
-   * Otherwise home directory is obtained via getpwuid function.
-   *
-   * Returns NULL on failure.
-   *
-   * Deprecated.
-   */
-  const char* getvnchomedir();
-
 }
 
 #endif /* OS_OS_H */
diff --git a/java/com/tigervnc/vncviewer/FileUtils.java b/java/com/tigervnc/vncviewer/FileUtils.java
@@ -80,7 +80,6 @@ public static String getVncConfigDir() {
       return newDir.getPath();
     } else {
       if (legacyDir.exists()) {
-        vlog.info("WARNING: ~/.vnc is deprecated, see https://github.com/TigerVNC/tigervnc/pull/1737");
         return legacyDir.getPath();
       }
       String configHome = System.getenv("XDG_CONFIG_HOME");

diff --git a/unix/vncserver/vncserver.in b/unix/vncserver/vncserver.in
@@ -37,9 +37,7 @@
 
 # Start with legacy ~/.vnc user dir
 $vncUserDir = "$ENV{HOME}/.vnc";
-if (stat($vncUserDir)) {
-  warn "~/.vnc is deprecated, see https://github.com/TigerVNC/tigervnc/pull/1737";
-} else {
+if (!stat($vncUserDir)) {
   # Legacy path doesn't exist, start using new XDG-alike path
   $vncUserDir = rindex("$ENV{XDG_CONFIG_HOME}", "/", 0) == 0
     ? "$ENV{XDG_CONFIG_HOME}/tigervnc"

diff --git a/unix/vncserver/vncsession.c b/unix/vncserver/vncsession.c
@@ -366,9 +366,7 @@ redir_stdio(const char *homedir, const char *display)
     close(fd);
 
     snprintf(logfile, sizeof(logfile), "%s/.vnc", homedir);
-    if (stat(logfile, &st) == 0)
-        syslog(LOG_WARNING, "~/.vnc is deprecated, see https://github.com/TigerVNC/tigervnc/pull/1737");
-    else {
+    if (stat(logfile, &st) != 0) {
         xdgstate = getenv("XDG_STATE_HOME");
         if (xdgstate != NULL && xdgstate[0] == '/')
             snprintf(logfile, sizeof(logfile), "%s/tigervnc", xdgstate);

diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
@@ -745,12 +745,6 @@ int main(int argc, char** argv)
 
   migrateDeprecatedOptions();
 
-#ifndef WIN32
-  // Check if legacy ~/.vnc dir exists and warn the user of its deprecation
-  struct stat st;
-  if (stat(os::getvnchomedir(), &st) == 0)
-    vlog.info(_("~/.vnc is deprecated, see https://github.com/TigerVNC/tigervnc/pull/1737"));
-#endif
   mkdirrecursive(os::getvncconfigdir());
   mkdirrecursive(os::getvncstatedir());