callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sort functions so their order is more "standard", some cosmetic cleanup

Browse Source 
2009-02-19  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkmountoperation.c: sort functions so their order is more
	"standard", some cosmetic cleanup (not changing any code).


svn path=/trunk/; revision=22377
This commit is contained in:
Michael Natterer
2009-02-19 15:15:49 +00:00
committed by Michael Natterer
parent 213ecb7a33
commit 753bebe045
2 changed files with 42 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-02-19 Michael Natterer <mitch@imendio.com>
* gtk/gtkmountoperation.c: sort functions so their order is more
"standard", some cosmetic cleanup (not changing any code).
2009-02-19 Michael Natterer <mitch@imendio.com> 2009-02-19 Michael Natterer <mitch@imendio.com>
* tests/testgtk.c: add some orientation flipping code to the * tests/testgtk.c: add some orientation flipping code to the

96
gtk/gtkmountoperation.c
View File

@ -68,8 +68,7 @@
* When necessary, #GtkMountOperation shows dialogs to ask for passwords. * When necessary, #GtkMountOperation shows dialogs to ask for passwords.
*/ */
/* GObject, GtkObject methods static void gtk_mount_operation_finalize (GObject *object);
*/
static void gtk_mount_operation_set_property (GObject *object, static void gtk_mount_operation_set_property (GObject *object,
guint prop_id, guint prop_id,
const GValue *value, const GValue *value,
@ -78,10 +77,7 @@ static void gtk_mount_operation_get_property (GObject *object,
guint prop_id, guint prop_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gtk_mount_operation_finalize (GObject *object);
/* GMountOperation methods
*/
static void gtk_mount_operation_ask_password (GMountOperation *op, static void gtk_mount_operation_ask_password (GMountOperation *op,
const char *message, const char *message,
const char *default_user, const char *default_user,
@ -121,30 +117,11 @@ struct _GtkMountOperationPrivate {
gboolean anonymous; gboolean anonymous;
}; };
static void
gtk_mount_operation_finalize (GObject *object)
{
GtkMountOperation *operation;
GtkMountOperationPrivate *priv;
operation = GTK_MOUNT_OPERATION (object);
priv = operation->priv;
if (priv->parent_window)
g_object_unref (priv->parent_window);
if (priv->screen)
g_object_unref (priv->screen);
G_OBJECT_CLASS (gtk_mount_operation_parent_class)->finalize (object);
}
static void static void
gtk_mount_operation_class_init (GtkMountOperationClass *klass) gtk_mount_operation_class_init (GtkMountOperationClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GMountOperationClass *mount_op_class; GMountOperationClass *mount_op_class = G_MOUNT_OPERATION_CLASS (klass);
g_type_class_add_private (klass, sizeof (GtkMountOperationPrivate)); g_type_class_add_private (klass, sizeof (GtkMountOperationPrivate));
@ -152,7 +129,6 @@ gtk_mount_operation_class_init (GtkMountOperationClass *klass)
object_class->get_property = gtk_mount_operation_get_property; object_class->get_property = gtk_mount_operation_get_property;
object_class->set_property = gtk_mount_operation_set_property; object_class->set_property = gtk_mount_operation_set_property;
mount_op_class = G_MOUNT_OPERATION_CLASS (klass);
mount_op_class->ask_password = gtk_mount_operation_ask_password; mount_op_class->ask_password = gtk_mount_operation_ask_password;
mount_op_class->ask_question = gtk_mount_operation_ask_question; mount_op_class->ask_question = gtk_mount_operation_ask_question;
mount_op_class->aborted = gtk_mount_operation_aborted; mount_op_class->aborted = gtk_mount_operation_aborted;
@ -180,9 +156,30 @@ gtk_mount_operation_class_init (GtkMountOperationClass *klass)
P_("The screen where this window will be displayed."), P_("The screen where this window will be displayed."),
GDK_TYPE_SCREEN, GDK_TYPE_SCREEN,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
} }
static void
gtk_mount_operation_init (GtkMountOperation *operation)
{
operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,
GTK_TYPE_MOUNT_OPERATION,
GtkMountOperationPrivate);
}
static void
gtk_mount_operation_finalize (GObject *object)
{
GtkMountOperation *operation = GTK_MOUNT_OPERATION (object);
GtkMountOperationPrivate *priv = operation->priv;
if (priv->parent_window)
g_object_unref (priv->parent_window);
if (priv->screen)
g_object_unref (priv->screen);
G_OBJECT_CLASS (gtk_mount_operation_parent_class)->finalize (object);
}
static void static void
gtk_mount_operation_set_property (GObject *object, gtk_mount_operation_set_property (GObject *object,
@ -190,25 +187,20 @@ gtk_mount_operation_set_property (GObject *object,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkMountOperation *operation; GtkMountOperation *operation = GTK_MOUNT_OPERATION (object);
gpointer tmp;
operation = GTK_MOUNT_OPERATION (object);
switch (prop_id) switch (prop_id)
{ {
case PROP_PARENT: case PROP_PARENT:
tmp = g_value_get_object (value); gtk_mount_operation_set_parent (operation, g_value_get_object (value));
gtk_mount_operation_set_parent (operation, tmp); break;
break;
case PROP_SCREEN: case PROP_SCREEN:
tmp = g_value_get_object (value); gtk_mount_operation_set_screen (operation, g_value_get_object (value));
gtk_mount_operation_set_screen (operation, tmp); break;
break;
case PROP_IS_SHOWING: case PROP_IS_SHOWING:
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
} }
@ -220,11 +212,8 @@ gtk_mount_operation_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkMountOperationPrivate *priv; GtkMountOperation *operation = GTK_MOUNT_OPERATION (object);
GtkMountOperation *operation; GtkMountOperationPrivate *priv = operation->priv;
operation = GTK_MOUNT_OPERATION (object);
priv = operation->priv;
switch (prop_id) switch (prop_id)
{ {
@ -246,14 +235,6 @@ gtk_mount_operation_get_property (GObject *object,
} }
} }
static void
gtk_mount_operation_init (GtkMountOperation *operation)
{
operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,
GTK_TYPE_MOUNT_OPERATION,
GtkMountOperationPrivate);
}
static void static void
remember_button_toggled (GtkToggleButton *button, remember_button_toggled (GtkToggleButton *button,
GtkMountOperation *operation) GtkMountOperation *operation)
@ -274,11 +255,8 @@ pw_dialog_got_response (GtkDialog *dialog,
gint response_id, gint response_id,
GtkMountOperation *mount_op) GtkMountOperation *mount_op)
{ {
GtkMountOperationPrivate *priv; GtkMountOperationPrivate *priv = mount_op->priv;
GMountOperation *op; GMountOperation *op = G_MOUNT_OPERATION (mount_op);
priv = mount_op->priv;
op = G_MOUNT_OPERATION (mount_op);
if (response_id == GTK_RESPONSE_OK) if (response_id == GTK_RESPONSE_OK)
{ {