← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gnome-mount/hardy

« back to all changes in this revision

Viewing changes to src/gnome-mount-properties-view.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-03-05 15:30:46 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080305153046-1m3pthhak9rx6yl7
Tags: 0.8~svn20080225-0ubuntu1
https://launchpad.net/bugs/186196
https://launchpad.net/bugs/149277
* Update to SVN snapshot:
  - Builds nautilus extension for new nautilus 2.0 ABI now, unbreaking the
    volume/drive properties tabs. (LP: #186196)
  - Applied debian/patches/02_msgbox_unref.patch upstream, removed patch.
  - No other changes.
* debian/patches/ubuntu-default-mount-options.patch: Use 'flush' option for
  vfat. It does not actually work in the current kernel, but at least it's
  there once it will actually do something useful. (LP: #149277)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome-mount-properties-view.c
34
34
#include <sys/time.h>
35
35
#include <string.h>
36
36
#include <gconf/gconf-client.h>
37
 
#include <libgnomevfs/gnome-vfs-utils.h>
38
37
 
39
38
#ifdef __FreeBSD__
40
39
#include <fstab.h>
92
91
G_DEFINE_TYPE (GnomeMountPropertiesView, gm_properties_view, GTK_TYPE_VBOX)
93
92
 
94
93
static void
95
 
gm_properties_view_dispose (GObject *object)
 
94
gm_properties_view_finalize (GObject *object)
96
95
{
97
96
        GnomeMountPropertiesView *properties = GM_PROPERTIES_VIEW (object);
98
97
 
105
104
                g_free (properties->keydir);
106
105
                properties->keydir = NULL;
107
106
        }
 
107
 
 
108
        G_OBJECT_CLASS (gm_properties_view_parent_class)->finalize (object);
108
109
}
109
110
 
110
111
static void
112
113
{
113
114
        GObjectClass *g_object_class = G_OBJECT_CLASS (properties_class);
114
115
 
115
 
        g_object_class->dispose = gm_properties_view_dispose;
 
116
        g_object_class->finalize = gm_properties_view_finalize;
116
117
}
117
118
 
118
119
static char *
552
553
                            glade_xml_get_widget (properties->xml, "gm_page_volume_root"),
553
554
                            TRUE, TRUE, 0);
554
555
 
555
 
        fssize = gnome_vfs_format_file_size_for_display (libhal_volume_get_size (vol));
 
556
        fssize = g_format_size_for_display (libhal_volume_get_size (vol));
556
557
        if (libhal_volume_get_fstype (vol) != NULL && libhal_volume_get_fsversion (vol) != NULL) {
557
558
                fstype = g_strdup_printf ("%s (%s)", 
558
559
                                          libhal_volume_get_fstype (vol),
790
791
                                "volume_fstype_entry",
791
792
                                "volume_expander");
792
793
 
793
 
        gtk_signal_connect (glade_xml_get_widget (properties->xml, "volume_mount_point_entry"), 
794
 
                            "changed",
795
 
                            GTK_SIGNAL_FUNC (mount_point_entry_changed), 
796
 
                            properties);
797
 
        gtk_signal_connect (glade_xml_get_widget (properties->xml, "volume_fstype_entry"), 
798
 
                            "changed",
799
 
                            GTK_SIGNAL_FUNC (fstype_entry_changed), 
800
 
                            properties);
801
 
        gtk_signal_connect (glade_xml_get_widget (properties->xml, "volume_mount_options_entry"), 
802
 
                            "changed",
803
 
                            GTK_SIGNAL_FUNC (mount_options_entry_changed), 
804
 
                            properties);
 
794
        g_signal_connect (glade_xml_get_widget (properties->xml, "volume_mount_point_entry"), 
 
795
                          "changed",
 
796
                          G_CALLBACK (mount_point_entry_changed), 
 
797
                          properties);
 
798
        g_signal_connect (glade_xml_get_widget (properties->xml, "volume_fstype_entry"), 
 
799
                          "changed",
 
800
                          G_CALLBACK (fstype_entry_changed), 
 
801
                          properties);
 
802
        g_signal_connect (glade_xml_get_widget (properties->xml, "volume_mount_options_entry"), 
 
803
                          "changed",
 
804
                          G_CALLBACK (mount_options_entry_changed), 
 
805
                          properties);
805
806
 
806
807
        g_free (fssize);
807
808
        g_free (fstype);
1038
1039
                                "drive_fstype_entry",
1039
1040
                                "drive_expander");
1040
1041
 
1041
 
        gtk_signal_connect (glade_xml_get_widget (properties->xml, "drive_mount_point_entry"), 
1042
 
                            "changed",
1043
 
                            GTK_SIGNAL_FUNC (mount_point_entry_changed), 
1044
 
                            properties);
1045
 
        gtk_signal_connect (glade_xml_get_widget (properties->xml, "drive_fstype_entry"), 
1046
 
                            "changed",
1047
 
                            GTK_SIGNAL_FUNC (fstype_entry_changed), 
1048
 
                            properties);
1049
 
        gtk_signal_connect (glade_xml_get_widget (properties->xml, "drive_mount_options_entry"), 
1050
 
                            "changed",
1051
 
                            GTK_SIGNAL_FUNC (mount_options_entry_changed), 
1052
 
                            properties);
 
1042
        g_signal_connect (glade_xml_get_widget (properties->xml, "drive_mount_point_entry"), 
 
1043
                          "changed",
 
1044
                          G_CALLBACK (mount_point_entry_changed), 
 
1045
                          properties);
 
1046
        g_signal_connect (glade_xml_get_widget (properties->xml, "drive_fstype_entry"), 
 
1047
                          "changed",
 
1048
                          G_CALLBACK (fstype_entry_changed), 
 
1049
                          properties);
 
1050
        g_signal_connect (glade_xml_get_widget (properties->xml, "drive_mount_options_entry"), 
 
1051
                          "changed",
 
1052
                          G_CALLBACK (mount_options_entry_changed), 
 
1053
                          properties);
1053
1054
        
1054
1055
        g_free (vendor);
1055
1056
        g_free (model);