src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c

*** 57,67 ****
  }
  
  static gboolean filenameFilterCallback(const GtkFileFilterInfo * filter_info, gpointer obj)
  {
      JNIEnv *env;
-     jclass cx;
      jstring filename;
  
      env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
  
      filename = (*env)->NewStringUTF(env, filter_info->filename);
--- 57,66 ----
*** 155,221 ****
          }
      }
  
      fp_gdk_threads_leave();
  }
! 
! /**
!  * Convert a GSList to an array of filenames (without the parent folder)
   */
! static jobjectArray toFilenamesArray(JNIEnv *env, GSList* list)
! {
!     jstring str;
!     jclass stringCls;
!     GSList *iterator;
!     jobjectArray array;
!     int i;
!     char* entry;
  
!     if (NULL == list) {
!         return NULL;
!     }
  
!     stringCls = (*env)->FindClass(env, "java/lang/String");
!     if (stringCls == NULL) {
!         (*env)->ExceptionClear(env);
!         JNU_ThrowInternalError(env, "Could not get java.lang.String class");
!         return NULL;
      }
  
!     array = (*env)->NewObjectArray(env, fp_gtk_g_slist_length(list), stringCls, NULL);
!     if (array == NULL) {
!         (*env)->ExceptionClear(env);
!         JNU_ThrowInternalError(env, "Could not instantiate array files array");
!         return NULL;
!     }
  
!     i = 0;
!     for (iterator = list; iterator; iterator = iterator->next) {
!         entry = (char*) iterator->data;
!         entry = strrchr(entry, '/') + 1;
!         str = (*env)->NewStringUTF(env, entry);
!         if (str && !(*env)->ExceptionCheck(env)) {
!             (*env)->SetObjectArrayElement(env, array, i, str);
          }
!         i++;
      }
  
!     return array;
  }
  
  /**
!  * Convert a GSList to an array of filenames (with the parent folder)
   */
! static jobjectArray toPathAndFilenamesArray(JNIEnv *env, GSList* list)
  {
      jstring str;
      jclass stringCls;
      GSList *iterator;
      jobjectArray array;
      int i;
!     char* entry;
! 
  
      if (list == NULL) {
          return NULL;
      }
  
--- 154,210 ----
          }
      }
  
      fp_gdk_threads_leave();
  }
! /*
!  * baseDir should be freed by user.
   */
! static gboolean isFromSameDirectory(GSList* list, gchar** baseDir) {
  
!     GSList *it = list;
!     gchar* prevDir = NULL;
!     gboolean isAllDirsSame = TRUE;
  
!     while (it) {
!         gchar* dir = fp_g_path_get_dirname((gchar*) it->data);
!         if (prevDir && strcmp(prevDir, dir) != 0) {
!             isAllDirsSame = FALSE;
!             fp_g_free(dir);
!             break;
          }
  
!         free(prevDir);
!         prevDir = strdup(dir);
!         fp_g_free(dir);
  
!         it = it->next;
      }
! 
!     if (isAllDirsSame) {
!         *baseDir = prevDir;
!     } else {
!         free(prevDir);
!         *baseDir = strdup("/");
      }
  
!     return isAllDirsSame;
  }
  
  /**
!  * Convert a GSList to an array of filenames
   */
! static jobjectArray toFilenamesArray(JNIEnv *env, GSList* list, jstring* jcurrent_folder)
  {
      jstring str;
      jclass stringCls;
      GSList *iterator;
      jobjectArray array;
      int i;
!     gchar* entry;
!     gchar * baseDir;
!     gboolean isFromSameDir;
  
      if (list == NULL) {
          return NULL;
      }
  
*** 231,295 ****
          (*env)->ExceptionClear(env);
          JNU_ThrowInternalError(env, "Could not instantiate array files array");
          return NULL;
      }
  
!     i = 0;
!     for (iterator = list; iterator; iterator = iterator->next) {
!         entry = (char*) iterator->data;
  
!         //check for leading slash.
!         if (entry[0] == '/') {
              entry++;
          }
  
          str = (*env)->NewStringUTF(env, entry);
          if (str && !(*env)->ExceptionCheck(env)) {
              (*env)->SetObjectArrayElement(env, array, i, str);
          }
-         i++;
      }
  
      return array;
  }
  
  static void handle_response(GtkWidget* aDialog, gint responseId, gpointer obj)
  {
      JNIEnv *env;
-     char *current_folder;
      GSList *filenames;
!     jclass cx;
!     jstring jcurrent_folder;
      jobjectArray jfilenames;
  
      env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
-     current_folder = NULL;
      filenames = NULL;
-     gboolean full_path_names = FALSE;
  
      if (responseId == GTK_RESPONSE_ACCEPT) {
-         current_folder = fp_gtk_file_chooser_get_current_folder(
-                 GTK_FILE_CHOOSER(aDialog));
-         if (current_folder == NULL) {
-             full_path_names = TRUE;
-         }
          filenames = fp_gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(aDialog));
      }
!     if (full_path_names) {
!         //This is a hack for use with "Recent Folders" in gtk where each
!         //file could have its own directory.
!         jfilenames = toPathAndFilenamesArray(env, filenames);
!         jcurrent_folder = (*env)->NewStringUTF(env, "/");
!     } else {
!         jfilenames = toFilenamesArray(env, filenames);
!         jcurrent_folder = (*env)->NewStringUTF(env, current_folder);
!     }
      if (!(*env)->ExceptionCheck(env)) {
          (*env)->CallVoidMethod(env, obj, setFileInternalMethodID,
                                 jcurrent_folder, jfilenames);
      }
!     fp_g_free(current_folder);
      quit(env, (jobject)obj, TRUE);
  }
  
  /*
   * Class:     sun_awt_X11_GtkFileDialogPeer
--- 220,282 ----
          (*env)->ExceptionClear(env);
          JNU_ThrowInternalError(env, "Could not instantiate array files array");
          return NULL;
      }
  
!     isFromSameDir = isFromSameDirectory(list, &baseDir);
  
!     *jcurrent_folder = (*env)->NewStringUTF(env, baseDir);
!     if (*jcurrent_folder == NULL) {
!         (*env)->ExceptionClear(env);
!         JNU_ThrowInternalError(env, "Could not instantiate current folder");
!         free(baseDir);
!         return NULL;
!     }
! 
!     for (iterator = list, i=0;
!             iterator;
!             iterator = iterator->next, i++) {
! 
!         entry = (gchar*) iterator->data;
! 
!         if (isFromSameDir) {
!             entry = strrchr(entry, '/') + 1;
!         } else if (entry[0] == '/') {
              entry++;
          }
  
          str = (*env)->NewStringUTF(env, entry);
          if (str && !(*env)->ExceptionCheck(env)) {
              (*env)->SetObjectArrayElement(env, array, i, str);
          }
      }
  
+     free(baseDir);
      return array;
  }
  
  static void handle_response(GtkWidget* aDialog, gint responseId, gpointer obj)
  {
      JNIEnv *env;
      GSList *filenames;
!     jstring jcurrent_folder = NULL;
      jobjectArray jfilenames;
  
      env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
      filenames = NULL;
  
      if (responseId == GTK_RESPONSE_ACCEPT) {
          filenames = fp_gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(aDialog));
      }
! 
!     jfilenames = toFilenamesArray(env, filenames, &jcurrent_folder);
! 
      if (!(*env)->ExceptionCheck(env)) {
          (*env)->CallVoidMethod(env, obj, setFileInternalMethodID,
                                 jcurrent_folder, jfilenames);
      }
! 
      quit(env, (jobject)obj, TRUE);
  }
  
  /*
   * Class:     sun_awt_X11_GtkFileDialogPeer