[gentoo-commits] gentoo-x86 commit in app-cdr/isomaster/files: isomaster-1.3.8-gtk_file_chooser_get_current.patch isomaster-1.3.8-unbundle-iniparser.patch

[Sebastian Pipping (sping)]

sping       12/01/07 18:42:48

  Added:                isomaster-1.3.8-gtk_file_chooser_get_current.patch
                        isomaster-1.3.8-unbundle-iniparser.patch
  Log:
  app-cdr/isomaster: 1.3.8
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch?rev=1.1&content-type=text/plain

Index: isomaster-1.3.8-gtk_file_chooser_get_current.patch
===================================================================
From eabb3f85d12121409f901d64c556a9f579c11864 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@×××××××.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@×××××××.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




1.1                  app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch?rev=1.1&content-type=text/plain

Index: isomaster-1.3.8-unbundle-iniparser.patch
===================================================================
From 598606c7b96e421ffbcb09ccd9aac61fa83cd0fe Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@×××××××.org>
Date: Sat, 7 Jan 2012 17:42:13 +0100
Subject: [PATCH] Unbundle iniparser, fix use of compile/link flags

---
 Makefile |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 363a36a..c0434fb 100644
--- a/Makefile
+++ b/Makefile
@@ -65,21 +65,18 @@ OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.
 
 all: translations isomaster.desktop isomaster
 
-isomaster: $(OBJECTS) lib iniparser
+isomaster: $(OBJECTS) lib
 	@echo 'Linking isomaster'
-	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
+	@$(CC) $(LDFLAGS) $(OBJECTS) bk/bk.a `pkg-config --libs gtk+-2.0` -liniparser -o isomaster
 
 # static pattern rule
 $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile
 	@echo 'Compiling' $<
-	@$(CC) $< $(CFLAGS) $(CPPFLAGS) -c -o $@
+	@$(CC) $(CFLAGS) $(CPPFLAGS) $< -c -o $@
 
 lib:
 	cd bk && $(MAKE)
 
-iniparser:
-	cd iniparser-2.17 && $(MAKE)
-
 translations:
 ifndef WITHOUT_NLS
 	cd po && $(MAKE)
@@ -94,7 +91,6 @@ bk-doc:
 
 clean: 
 	cd bk && $(MAKE) clean
-	cd iniparser-2.17 && $(MAKE) clean
 ifndef WITHOUT_NLS
 	cd po && $(MAKE) clean
 endif
diff --git a/settings.h b/settings.h
index fda67b7..e619e0c 100644
--- a/settings.h
+++ b/settings.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 
 #include "isomaster.h"
-#include "iniparser-2.17/src/iniparser.h"
+#include <iniparser.h>
 
 #define ISOMASTER_DEFAULT_WINDOW_WIDTH 500
 #define ISOMASTER_DEFAULT_WINDOW_HEIGHT 550
-- 
1.7.8.3