← Back to branch summary

~ubuntu-branches/ubuntu/vivid/brasero/vivid-proposed

« back to all changes in this revision

Viewing changes to plugins/checksum/burn-checksum-image.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl, Laurent Bigonville, Michael Biebl
  • Date: 2011-10-13 20:13:30 UTC
  • mfrom: (1.4.5 experimental)
  • mto: (1.4.7 experimental)
  • mto: This revision was merged to the branch mainline in revision 96.
  • Revision ID: james.westby@ubuntu.com-20111013201330-r1rg6r6uof0cwpsp
Tags: 3.0.0-4
[ Laurent Bigonville ]
* debian/control.in: Update Vcs-* fields

[ Michael Biebl ]
* Upload to unstable.
* debian/patches/02_gcc-format-security.patch
  - Fix format string vulnerabilities.
* debian/watch:
  - Switch to .xz tarballs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/checksum/burn-checksum-image.c
47
47
 
48
48
#include <gmodule.h>
49
49
 
50
 
#include <gconf/gconf-client.h>
51
 
 
52
50
#include "brasero-plugin-registration.h"
53
51
#include "burn-job.h"
54
52
#include "burn-volume.h"
87
85
 
88
86
#define BRASERO_CHECKSUM_IMAGE_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_CHECKSUM_IMAGE, BraseroChecksumImagePrivate))
89
87
 
90
 
#define GCONF_KEY_CHECKSUM_TYPE         "/apps/brasero/config/checksum_image"
 
88
#define BRASERO_SCHEMA_CONFIG           "org.gnome.brasero.config"
 
89
#define BRASERO_PROPS_CHECKSUM_IMAGE    "checksum-image"
91
90
 
92
91
static BraseroJobClass *parent_class = NULL;
93
92
 
419
418
static BraseroChecksumType
420
419
brasero_checksum_get_checksum_type (void)
421
420
{
422
 
        GConfClient *client;
 
421
        GSettings *settings;
423
422
        GChecksumType checksum_type;
424
423
 
425
 
        client = gconf_client_get_default ();
426
 
        checksum_type = gconf_client_get_int (client, GCONF_KEY_CHECKSUM_TYPE, NULL);
427
 
        g_object_unref (client);
 
424
        settings = g_settings_new (BRASERO_SCHEMA_CONFIG);
 
425
        checksum_type = g_settings_get_int (settings, BRASERO_PROPS_CHECKSUM_IMAGE);
 
426
        g_object_unref (settings);
428
427
 
429
428
        return checksum_type;
430
429
}
825
824
        BraseroPluginConfOption *checksum_type;
826
825
 
827
826
        brasero_plugin_define (plugin,
 
827
                               "image-checksum",
828
828
                               /* Translators: this is the name of the plugin
829
829
                                * which will be translated only when it needs
830
830
                                * displaying. */
852
852
        g_slist_free (input);
853
853
 
854
854
        /* add some configure options */
855
 
        checksum_type = brasero_plugin_conf_option_new (GCONF_KEY_CHECKSUM_TYPE,
 
855
        checksum_type = brasero_plugin_conf_option_new (BRASERO_PROPS_CHECKSUM_IMAGE,
856
856
                                                        _("Hashing algorithm to be used:"),
857
857
                                                        BRASERO_PLUGIN_OPTION_CHOICE);
858
858
        brasero_plugin_conf_option_choice_add (checksum_type,