← Back to branch summary

~ubuntu-branches/ubuntu/maverick/brasero/maverick

« back to all changes in this revision

Viewing changes to src/brasero-setting.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2010-07-04 15:14:24 UTC
  • mfrom: (1.3.7 upstream)
  • mto: This revision was merged to the branch mainline in revision 74.
  • Revision ID: james.westby@ubuntu.com-20100704151424-yg69h5sc55xgjp6h
Tags: 2.30.2-1
http://bugs.debian.org/568606
http://bugs.debian.org/465238
* New upstream release.
  - Fixes incorrectly reported size by passing correct arguments to
    g_signal_emit(). Closes: #568606
  - Fixes tracker search support. Closes: #465238
* debian/patches/90_relibtoolize.patch
  - Refresh for new upstream release.
* Switch to source formate 3.0 (quilt)
  - Add debian/source/format.
  - Drop Build-Depends on quilt.
  - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
* Bump-Standards-Version to 3.9.0
  - Use architecture wildcard kfreebsd-any for the libcam-dev Build-Depends.
  - Use Breaks instead of Conflicts as recommended by the new policy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-setting.c
280
280
        return TRUE;
281
281
}
282
282
 
 
283
static gint
 
284
brasero_setting_get_integer (GKeyFile *file,
 
285
                             const gchar *group_name,
 
286
                             const gchar *key)
 
287
{
 
288
        GError *error = NULL;
 
289
        gint int_value;
 
290
 
 
291
        int_value = g_key_file_get_integer (file, group_name, key, &error);
 
292
        if (!int_value && error) {
 
293
                g_error_free (error);
 
294
                return -1;
 
295
        }
 
296
 
 
297
        return int_value;
 
298
}
 
299
 
283
300
gboolean
284
301
brasero_setting_load (BraseroSetting *setting)
285
302
{
344
361
                                                     "Display",
345
362
                                                     "main-window-maximized",
346
363
                                                     NULL);
347
 
        priv->stock_file_chooser_percent = g_key_file_get_integer (key_file,
348
 
                                                                   "Display",
349
 
                                                                   "stock-file-chooser-percent",
350
 
                                                                   NULL);
351
 
        priv->brasero_file_chooser_percent = g_key_file_get_integer (key_file,
352
 
                                                                     "Display",
353
 
                                                                     "brasero-file-chooser-percent",
354
 
                                                                     NULL);
 
364
        priv->stock_file_chooser_percent = brasero_setting_get_integer (key_file,
 
365
                                                                        "Display",
 
366
                                                                        "stock-file-chooser-percent");
 
367
        priv->brasero_file_chooser_percent = brasero_setting_get_integer (key_file,
 
368
                                                                          "Display",
 
369
                                                                          "brasero-file-chooser-percent");
355
370
        priv->player_volume = g_key_file_get_integer (key_file,
356
371
                                                      "Player",
357
372
                                                      "player-volume",
384
399
                                                          "Player",
385
400
                                                          "video-size-height",
386
401
                                                          NULL);
387
 
        priv->display_proportion = priv->image_size_width = g_key_file_get_integer (key_file,
388
 
                                                                                  "Display",
389
 
                                                                                  "pane-position",
390
 
                                                                                  NULL);
391
 
 
 
402
        priv->display_proportion = brasero_setting_get_integer (key_file,
 
403
                                                                "Display",
 
404
                                                                "pane-position");
392
405
        g_key_file_free (key_file);
393
406
 
394
407
        return TRUE;