projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: improve doc of g_file_equal()
[platform/upstream/glib.git]
/
gio
/
gmountoperation.c
diff --git
a/gio/gmountoperation.c
b/gio/gmountoperation.c
index
ec7f5ff
..
d0ede5d
100644
(file)
--- a/
gio/gmountoperation.c
+++ b/
gio/gmountoperation.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
@@
-51,8
+49,6
@@
* passed, see each method taking a #GMountOperation for details.
*/
* passed, see each method taking a #GMountOperation for details.
*/
-G_DEFINE_TYPE (GMountOperation, g_mount_operation, G_TYPE_OBJECT);
-
enum {
ASK_PASSWORD,
ASK_QUESTION,
enum {
ASK_PASSWORD,
ASK_QUESTION,
@@
-84,6
+80,8
@@
enum {
PROP_CHOICE
};
PROP_CHOICE
};
+G_DEFINE_TYPE_WITH_PRIVATE (GMountOperation, g_mount_operation, G_TYPE_OBJECT)
+
static void
g_mount_operation_set_property (GObject *object,
guint prop_id,
static void
g_mount_operation_set_property (GObject *object,
guint prop_id,
@@
-253,8
+251,6
@@
static void
g_mount_operation_class_init (GMountOperationClass *klass)
{
GObjectClass *object_class;
g_mount_operation_class_init (GMountOperationClass *klass)
{
GObjectClass *object_class;
-
- g_type_class_add_private (klass, sizeof (GMountOperationPrivate));
object_class = G_OBJECT_CLASS (klass);
object_class->finalize = g_mount_operation_finalize;
object_class = G_OBJECT_CLASS (klass);
object_class->finalize = g_mount_operation_finalize;
@@
-513,9
+509,7
@@
g_mount_operation_class_init (GMountOperationClass *klass)
static void
g_mount_operation_init (GMountOperation *operation)
{
static void
g_mount_operation_init (GMountOperation *operation)
{
- operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,
- G_TYPE_MOUNT_OPERATION,
- GMountOperationPrivate);
+ operation->priv = g_mount_operation_get_instance_private (operation);
}
/**
}
/**