1 Index: src/burn.c 2 =================================================================== 3 --- src/burn.c (revision 1275) 4 +++ src/burn.c (working copy) 5 @@ -83,7 +83,7 @@ 6 { \ 7 brasero_burn_log (burn, \ 8 "unsupported operation (in %s at %s)", \ 9 - G_STRFUNC, \ 10 + __func__, \ 11 G_STRLOC); \ 12 return BRASERO_BURN_NOT_SUPPORTED; \ 13 } 14 @@ -92,7 +92,7 @@ 15 { \ 16 brasero_burn_log (burn, \ 17 "not ready to operate (in %s at %s)", \ 18 - G_STRFUNC, \ 19 + __func__, \ 20 G_STRLOC); \ 21 return BRASERO_BURN_NOT_READY; \ 22 } 23 @@ -103,7 +103,7 @@ 24 BRASERO_BURN_LOG (message, ##__VA_ARGS__); \ 25 format = g_strdup_printf ("%s (%s %s)", \ 26 message, \ 27 - G_STRFUNC, \ 28 + __func__, \ 29 G_STRLOC); \ 30 brasero_burn_log (burn, \ 31 format, \ 32 Index: src/burn-medium.c 33 =================================================================== 34 --- src/burn-medium.c (revision 1275) 35 +++ src/burn-medium.c (working copy) 36 @@ -146,7 +146,7 @@ 37 BraseroMediumPrivate *priv; 38 39 priv = BRASERO_MEDIUM_PRIVATE (medium); 40 - return priv->type; 41 + return priv->type ? priv->type : ""; 42 } 43 44 const gchar * 45 Index: src/burn-job.c 46 =================================================================== 47 --- src/burn-job.c (revision 1275) 48 +++ src/burn-job.c (working copy) 49 @@ -94,7 +94,7 @@ 50 brasero_job_log_message (job_MACRO, G_STRLOC, \ 51 "%s called %s", \ 52 class_name_MACRO, \ 53 - G_STRFUNC); \ 54 + __func__); \ 55 } 56 57 #define BRASERO_JOB_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_JOB, BraseroJobPrivate)) 58 @@ -1748,7 +1748,7 @@ 59 if (!priv->ctx) { 60 BRASERO_JOB_LOG (self, 61 "called %s whereas it wasn't running", 62 - G_STRFUNC); 63 + __func__); 64 return BRASERO_BURN_NOT_RUNNING; 65 } 66 67 Index: src/brasero-project.c 68 =================================================================== 69 --- src/brasero-project.c (revision 1275) 70 +++ src/brasero-project.c (working copy) 71 @@ -1443,6 +1443,7 @@ 72 g_slist_free (uris); 73 74 gtk_widget_destroy (GTK_WIDGET (project->priv->chooser)); 75 + project->priv->chooser = NULL; 76 } 77 78 static void 79 @@ -1455,6 +1456,7 @@ 80 81 if (response != BRASERO_RESPONSE_ADD) { 82 gtk_widget_destroy (chooser); 83 + project->priv->chooser = NULL; 84 return; 85 } 86 87 @@ -1469,6 +1471,7 @@ 88 g_slist_free (uris); 89 90 gtk_widget_destroy (GTK_WIDGET (project->priv->chooser)); 91 + project->priv->chooser = NULL; 92 } 93 94 static void 95 Index: src/burn-plugin.c 96 =================================================================== 97 --- src/burn-plugin.c (revision 1275) 98 +++ src/burn-plugin.c (working copy) 99 @@ -457,7 +457,7 @@ 100 BraseroPluginPrivate *priv; 101 102 priv = BRASERO_PLUGIN_PRIVATE (self); 103 - return priv->error; 104 + return priv->error ? priv->error : ""; 105 } 106 107 static BraseroPluginFlags * 108 Index: src/eggtreemultidnd.c 109 =================================================================== 110 --- src/eggtreemultidnd.c (revision 1275) 111 +++ src/eggtreemultidnd.c (working copy) 112 @@ -175,8 +175,16 @@ 113 114 g_slist_free (priv_data->event_list); 115 priv_data->event_list = NULL; 116 - g_signal_handler_disconnect (widget, priv_data->motion_notify_handler); 117 - g_signal_handler_disconnect (widget, priv_data->button_release_handler); 118 + if (g_signal_handler_is_connected (widget, 119 + priv_data->motion_notify_handler)) { 120 + g_signal_handler_disconnect (widget, 121 + priv_data->motion_notify_handler); 122 + } 123 + if (g_signal_handler_is_connected (widget, 124 + priv_data->button_release_handler)) { 125 + g_signal_handler_disconnect (widget, 126 + priv_data->button_release_handler); 127 + } 128 } 129 130 static gboolean 131 Index: src/plugins/cdrtools/burn-mkisofs.c 132 =================================================================== 133 --- src/plugins/cdrtools/burn-mkisofs.c (revision 1275) 134 +++ src/plugins/cdrtools/burn-mkisofs.c (working copy) 135 @@ -316,7 +316,11 @@ 136 BRASERO_SUB)); 137 138 g_ptr_array_add (argv, g_strdup ("-sysid")); 139 +#if defined(HAVE_STRUCT_USCSI_CMD) 140 + g_ptr_array_add (argv, g_strdup ("SOLARIS")); 141 +#else 142 g_ptr_array_add (argv, g_strdup ("LINUX")); 143 +#endif 144 145 /* FIXME! -sort is an interesting option allowing to decide where the 146 * files are written on the disc and therefore to optimize later reading */ 147 Index: src/plugins/cdrtools/burn-cdrecord.c 148 =================================================================== 149 --- src/plugins/cdrtools/burn-cdrecord.c (revision 1275) 150 +++ src/plugins/cdrtools/burn-cdrecord.c (working copy) 151 @@ -653,6 +653,7 @@ 152 BraseroBurnFlag flags; 153 BraseroTrackType type; 154 BraseroCDRecordPrivate *priv; 155 + BraseroMedia media; 156 157 priv = BRASERO_CD_RECORD_PRIVATE (cdrecord); 158 159 @@ -668,6 +669,7 @@ 160 g_ptr_array_add (argv, speed_str); 161 } 162 163 + 164 brasero_job_get_flags (BRASERO_JOB (cdrecord), &flags); 165 if (flags & BRASERO_BURN_FLAG_OVERBURN) 166 g_ptr_array_add (argv, g_strdup ("-overburn")); 167 @@ -687,6 +689,12 @@ 168 if (flags & BRASERO_BURN_FLAG_DAO) 169 g_ptr_array_add (argv, g_strdup ("-dao")); 170 171 +/* brasero_job_get_media (BRASERO_JOB (cdrecord), &media); */ 172 +/* if (BRASERO_MEDIUM_IS (media, BRASERO_MEDIUM_DVDRW_PLUS | */ 173 +/* BRASERO_MEDIUM_UNFORMATTED)) { */ 174 +/* g_ptr_array_add (argv, g_strdup ("-format")); */ 175 +/* } */ 176 + 177 brasero_job_get_input_type (BRASERO_JOB (cdrecord), &type); 178 if (brasero_job_get_fd_in (BRASERO_JOB (cdrecord), NULL) == BRASERO_BURN_OK) { 179 BraseroBurnResult result; 180 @@ -850,12 +858,32 @@ 181 static BraseroBurnResult 182 brasero_cdrecord_set_argv_blank (BraseroCDRecord *cdrecord, GPtrArray *argv) 183 { 184 + BraseroMedia media; 185 gchar *blank_str; 186 BraseroBurnFlag flags; 187 188 +/* brasero_job_get_media (BRASERO_JOB (cdrecord), &media); */ 189 +/* if (BRASERO_MEDIUM_IS (media, BRASERO_MEDIUM_DVDRW_PLUS | */ 190 +/* BRASERO_MEDIUM_UNFORMATTED)) { */ 191 +/* g_ptr_array_add (argv, g_strdup ("-format")); */ 192 +/* } */ 193 + 194 brasero_job_get_flags (BRASERO_JOB (cdrecord), &flags); 195 blank_str = g_strdup_printf ("blank=%s", 196 - (flags & BRASERO_BURN_FLAG_FAST_BLANK) ? "fast" : "all"); 197 + (flags & BRASERO_BURN_FLAG_FAST_BLANK) ? "fast" : "all"); 198 + 199 + /* Fix */ 200 + 201 +/* brasero_job_get_media (BRASERO_JOB (cdrecord), &media); */ 202 +/* brasero_job_get_flags (BRASERO_JOB (cdrecord), &flags); */ 203 + 204 +/* if (!BRASERO_MEDIUM_IS (media, BRASERO_MEDIUM_DVDRW_PLUS | BRASERO_MEDIUM_UNFORMATTED)) { */ 205 +/* blank_str = g_strdup_printf ("blank=%s", */ 206 +/* (flags & BRASERO_BURN_FLAG_FAST_BLANK) ? "fast" : "all"); */ 207 +/* } else { */ 208 +/* blank_str = g_strdup_printf ("-format"); */ 209 +/* } */ 210 + 211 g_ptr_array_add (argv, blank_str); 212 213 brasero_job_set_current_action (BRASERO_JOB (cdrecord), 214 @@ -1204,6 +1232,7 @@ 215 BRASERO_MEDIUM_PLUS| 216 BRASERO_MEDIUM_REWRITABLE| 217 BRASERO_MEDIUM_APPENDABLE| 218 + BRASERO_MEDIUM_SEQUENTIAL| 219 BRASERO_MEDIUM_CLOSED| 220 BRASERO_MEDIUM_HAS_DATA| 221 BRASERO_MEDIUM_UNFORMATTED| 222 @@ -1211,6 +1240,16 @@ 223 brasero_plugin_blank_caps (plugin, output); 224 g_slist_free (output); 225 226 + brasero_plugin_set_blank_flags (plugin, 227 + BRASERO_MEDIUM_DVDRW | 228 + BRASERO_MEDIUM_BLANK| 229 + BRASERO_MEDIUM_CLOSED | 230 + BRASERO_MEDIUM_APPENDABLE| 231 + BRASERO_MEDIUM_HAS_DATA| 232 + BRASERO_MEDIUM_UNFORMATTED, 233 + BRASERO_BURN_FLAG_NOGRACE| 234 + BRASERO_BURN_FLAG_FAST_BLANK, 235 + BRASERO_BURN_FLAG_NONE); 236 /* again DVD+RW don't support dummy */ 237 brasero_plugin_set_blank_flags (plugin, 238 BRASERO_MEDIUM_DVDRW_PLUS| 239 Index: data/brasero.desktop.in.in 240 =================================================================== 241 --- data/brasero.desktop.in.in (revision 1275) 242 +++ data/brasero.desktop.in.in (working copy) 243 @@ -1,9 +1,11 @@ 244 [Desktop Entry] 245 -_Name=Brasero Disc Burning 246 +# SUN_BRANDING 247 +_Name=Brasero Disc Burner 248 _GenericName=Disc Burning Application 249 -_Comment=Write and copy CD / DVD 250 +# SUN_BRANDING 251 +_Comment=Write and copy CDs and DVDs 252 Categories=GNOME;AudioVideo;DiscBurning; 253 -Exec=brasero %U 254 +Exec=gksu brasero %U 255 Icon=brasero 256 MimeType=x-content/blank-cd;x-content/blank-dvd; 257 StartupNotify=true 258
Indexes created Sat Nov 28 12:39:51 UTC 2009
Terms of Use |
Privacy |
Trademarks |
Copyright Policy |
Site Guidelines |
Help
Your use of this web site or any of its content or software indicates your agreement to be bound by these Terms of Use.
Copyright © 1995-2008 Sun Microsystems, Inc.