aboutsummaryrefslogtreecommitdiff
path: root/sysutils/isomaster/files/patch-isobrowser.c
blob: 16fb70bb66d7b20c3420b9e06cc51c4fe0557fa3 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
--- isobrowser.c.orig	Sun Jan  7 14:11:34 2007
+++ isobrowser.c	Wed Jan 17 14:31:16 2007
@@ -57,6 +57,7 @@
 void addToIsoCbk(GtkButton *button, gpointer data)
 {
     GtkTreeSelection* selection;
+    char sizeStr[20];
     
     if(!GBLisoPaneActive)
     /* no iso open */
@@ -73,7 +74,6 @@
     }
     
     /* iso size label */
-    char sizeStr[20];
     GBLisoSize = 35845;
     //if(GBLvolInfo.filenameTypes & FNTYPE_JOLIET)
         GBLisoSize += 2048;
@@ -354,6 +354,7 @@
 void deleteFromIsoCbk(GtkButton *button, gpointer data)
 {
     GtkTreeSelection* selection;
+    char sizeStr[20];
     
     if(!GBLisoPaneActive)
     /* no iso open */
@@ -370,7 +371,6 @@
     }
     
     /* iso size label */
-    char sizeStr[20];
     GBLisoSize = 35845;
     //if(GBLvolInfo.filenameTypes & FNTYPE_JOLIET)
         GBLisoSize += 2048;
@@ -712,6 +712,7 @@
 {
     int rc;
     GtkWidget* warningDialog;
+    char sizeStr[20];
     
     if(GBLisoChangesProbable && !confirmCloseIso())
         return TRUE;
@@ -738,7 +739,6 @@
     GBLappSettings.filenameTypesToWrite = FNTYPE_9660 | FNTYPE_ROCKRIDGE | FNTYPE_JOLIET;
     
     /* iso size label */
-    char sizeStr[20];
     GBLisoSize = 35845;
     //if(GBLvolInfo.filenameTypes & FNTYPE_JOLIET)
         GBLisoSize += 2048;
@@ -763,6 +763,7 @@
 {
     int rc;
     GtkWidget* warningDialog;
+    char sizeStr[20];
     
     closeIso();
     
@@ -840,7 +841,6 @@
     /* END READ entire directory tree */
     
     /* iso size label */
-    char sizeStr[20];
     GBLisoSize = 35845;
     //if(GBLvolInfo.filenameTypes & FNTYPE_JOLIET)
         GBLisoSize += 2048;
@@ -896,10 +896,11 @@
     
     if(dialogRespose == GTK_RESPONSE_ACCEPT)
     {
+        char* lastIsoDir;
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
         
         /* RECORD last iso dir */
-        char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
+        lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
         
         if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
         {
@@ -955,6 +956,7 @@
 void refreshIsoView(void)
 {
     char* isoCurrentDir; /* for changeIsoDirectory() */
+    GdkRectangle visibleRect;
     
     isoCurrentDir = malloc(strlen(GBLisoCurrentDir) + 1);
     if(isoCurrentDir == NULL)
@@ -963,7 +965,6 @@
     strcpy(isoCurrentDir, GBLisoCurrentDir);
     
     /* remember scroll position */
-    GdkRectangle visibleRect;
     gtk_tree_view_get_visible_rect(GTK_TREE_VIEW(GBLisoTreeView), &visibleRect);
     
     changeIsoDirectory(isoCurrentDir);
@@ -1083,10 +1084,11 @@
     
     if(dialogResponse == GTK_RESPONSE_ACCEPT)
     {
+        char* lastIsoDir;
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
         
         /* RECORD last iso dir */
-        char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
+        lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
         
         if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
         {