1 files changed, 0 insertions, 99 deletions
diff --git a/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch b/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch
deleted file mode 100644
index ca8d178e369a..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From eabb3f85d12121409f901d64c556a9f579c11864 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 7 Jan 2012 19:30:52 +0100
-Subject: [PATCH] Handle NULL return from
- gtk_file_chooser_get_current_folder()
-
----
- isobrowser.c |   53 ++++++++++++++++++++++++++++++++++-------------------
- 1 files changed, 34 insertions(+), 19 deletions(-)
-
-diff --git a/isobrowser.c b/isobrowser.c
-index c03548b..e108f03 100644
---- a/isobrowser.c
-+++ b/isobrowser.c
-@@ -9,6 +9,7 @@
- * Andrew Smith, http://littlesvr.ca/misc/contactandrew.php
- *
- * Contributors:
-+* Sebastian Pipping <sebastian@pipping.org>
- * 
- ******************************************************************************/
- 
-@@ -1454,19 +1455,26 @@ gboolean openIsoCbk(GtkMenuItem* menuItem, gpointer data)
-         
-         /* RECORD last iso dir */
-         char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
--        
--        if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
-+        if(lastIsoDir)
-+        {
-+            if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
-+            {
-+                free(GBLappSettings.lastIsoDir);
-+                GBLappSettings.lastIsoDir = NULL;
-+            }
-+
-+            if(GBLappSettings.lastIsoDir == NULL)
-+                GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
-+
-+            strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
-+
-+            g_free(lastIsoDir);
-+        }
-+        else /* e.g. when opening a file from the <Recently used> view */
-         {
-             free(GBLappSettings.lastIsoDir);
-             GBLappSettings.lastIsoDir = NULL;
-         }
--        
--        if(GBLappSettings.lastIsoDir == NULL)
--            GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
--        
--        strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
--        
--        g_free(lastIsoDir);
-         /* END RECORD last iso dir */
-     }
-     
-@@ -1758,20 +1766,27 @@ gboolean saveIsoCbk(GtkWidget *widget, GdkEvent *event)
-         
-         /* RECORD last iso dir */
-         char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
--        
--        if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
-+        if(lastIsoDir)
-+        {
-+            if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
-+            {
-+                free(GBLappSettings.lastIsoDir);
-+                GBLappSettings.lastIsoDir = NULL;
-+            }
-+
-+            if(GBLappSettings.lastIsoDir == NULL)
-+                GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
-+
-+            strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
-+
-+            g_free(lastIsoDir);
-+        }
-+        else /* e.g. when opening a file from the <Recently used> view */
-         {
-             free(GBLappSettings.lastIsoDir);
-             GBLappSettings.lastIsoDir = NULL;
-         }
--        
--        if(GBLappSettings.lastIsoDir == NULL)
--            GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
--        
--        strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
--        
--        g_free(lastIsoDir);
--        /* END RECORD iso save dir */
-+        /* END RECORD last iso dir */
-         
-         askedToAddExtension = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(addExtensionCheckbox));
-     }
--- 
-1.7.8.3
-