aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-11-12 21:49:07 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-11-12 21:49:07 +0800
commitbfa3a0f723929a213b2dd453e91e8fd8d2dad18a (patch)
tree4a1765dc57cffdf5a07d0717c4f85205cc112737
parente996dc22515b3237899b054f8658c284c9fbb920 (diff)
downloadgsoc2013-evolution-bfa3a0f723929a213b2dd453e91e8fd8d2dad18a.tar
gsoc2013-evolution-bfa3a0f723929a213b2dd453e91e8fd8d2dad18a.tar.gz
gsoc2013-evolution-bfa3a0f723929a213b2dd453e91e8fd8d2dad18a.tar.bz2
gsoc2013-evolution-bfa3a0f723929a213b2dd453e91e8fd8d2dad18a.tar.lz
gsoc2013-evolution-bfa3a0f723929a213b2dd453e91e8fd8d2dad18a.tar.xz
gsoc2013-evolution-bfa3a0f723929a213b2dd453e91e8fd8d2dad18a.tar.zst
gsoc2013-evolution-bfa3a0f723929a213b2dd453e91e8fd8d2dad18a.zip
convert to G_DEFINE_TYPE
2004-11-12 JP Rosevear <jpr@novell.com> * e-timezone-dialog/e-timezone-dialog.c: convert to G_DEFINE_TYPE svn path=/trunk/; revision=27903
-rw-r--r--widgets/ChangeLog4
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.c18
2 files changed, 10 insertions, 12 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 55bbbb7884..62a00e5d0c 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-12 JP Rosevear <jpr@novell.com>
+
+ * e-timezone-dialog/e-timezone-dialog.c: convert to G_DEFINE_TYPE
+
2004-10-28 Li Yuan <li.yuan@sun.com>
* e-timezone-dialog/e-timezone-dialog.glade: Add a name for
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 19a5685b38..10b1930b8d 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -20,7 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <gtk/gtksignal.h>
#include <gtk/gtkcombo.h>
#include <gtk/gtkentry.h>
@@ -31,8 +34,6 @@
#include "e-timezone-dialog.h"
-#include <gal/util/e-util.h>
-
#define E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA 0xc070a0ff
#define E_TIMEZONE_DIALOG_MAP_POINT_HOVER_RGBA 0xffff60ff
#define E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA 0xff60e0ff
@@ -90,9 +91,7 @@ static void set_map_timezone (ETimezoneDialog *etd,
static void on_combo_changed (GtkEditable *entry,
ETimezoneDialog *etd);
-
-static GObjectClass *parent_class;
-
+G_DEFINE_TYPE (ETimezoneDialog, e_timezone_dialog, G_TYPE_OBJECT)
/* Class initialization function for the event editor */
static void
@@ -103,8 +102,6 @@ e_timezone_dialog_class_init (ETimezoneDialogClass *class)
object_class = G_OBJECT_CLASS (class);
object_class->dispose = e_timezone_dialog_dispose;
object_class->finalize = e_timezone_dialog_finalize;
-
- parent_class = gtk_type_class (G_TYPE_OBJECT);
}
/* Object initialization function for the event editor */
@@ -150,7 +147,7 @@ e_timezone_dialog_dispose (GObject *object)
priv->xml = NULL;
}
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+ (* G_OBJECT_CLASS (e_timezone_dialog_parent_class)->dispose) (object);
}
/* Finalize handler for the event editor */
@@ -168,7 +165,7 @@ e_timezone_dialog_finalize (GObject *object)
g_free (priv);
- (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+ (* G_OBJECT_CLASS (e_timezone_dialog_parent_class)->finalize) (object);
}
@@ -673,6 +670,3 @@ e_timezone_dialog_reparent (ETimezoneDialog *etd,
gtk_widget_reparent (priv->table, new_parent);
}
-
-E_MAKE_TYPE (e_timezone_dialog, "ETimezoneDialog", ETimezoneDialog,
- e_timezone_dialog_class_init, e_timezone_dialog_init, G_TYPE_OBJECT)