Author: nick
Date: 2008-01-14 11:33:17 +0000 (Mon, 14 Jan 2008)
New Revision: 26570
Modified:
mousepad/branches/nick_0_3/mousepad/mousepad-application.c
mousepad/branches/nick_0_3/mousepad/mousepad-dbus.c
mousepad/branches/nick_0_3/mousepad/mousepad-document.c
mousepad/branches/nick_0_3/mousepad/mousepad-encoding-dialog.c
mousepad/branches/nick_0_3/mousepad/mousepad-file.c
mousepad/branches/nick_0_3/mousepad/mousepad-preferences.c
mousepad/branches/nick_0_3/mousepad/mousepad-print.c
mousepad/branches/nick_0_3/mousepad/mousepad-private.h
mousepad/branches/nick_0_3/mousepad/mousepad-replace-dialog.c
mousepad/branches/nick_0_3/mousepad/mousepad-search-bar.c
mousepad/branches/nick_0_3/mousepad/mousepad-statusbar.c
mousepad/branches/nick_0_3/mousepad/mousepad-undo.c
mousepad/branches/nick_0_3/mousepad/mousepad-view.c
mousepad/branches/nick_0_3/mousepad/mousepad-window.c
Log:
* Use G_DEFINE_TYPE.
* Properly set the emission stage for all signals.
* Remove some unused code.
* Fix assert when dropping a file in the editor window.
* Small typo in the menu tooltips.
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-application.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-application.c 2008-01-14
01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-application.c 2008-01-14
11:33:17 UTC (rev 26570)
@@ -43,8 +43,6 @@
-
-
struct _MousepadApplicationClass
{
GObjectClass __parent__;
@@ -60,38 +58,15 @@
-static GObjectClass *mousepad_application_parent_class;
+G_DEFINE_TYPE (MousepadApplication, mousepad_application, G_TYPE_OBJECT);
-GType
-mousepad_application_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (G_TYPE_OBJECT,
- I_("MousepadApplication"),
- sizeof (MousepadApplicationClass),
- (GClassInitFunc)
mousepad_application_class_init,
- sizeof (MousepadApplication),
- (GInstanceInitFunc)
mousepad_application_init,
- 0);
- }
-
- return type;
-}
-
-
-
static void
mousepad_application_class_init (MousepadApplicationClass *klass)
{
GObjectClass *gobject_class;
- mousepad_application_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_application_finalize;
}
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-dbus.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-dbus.c 2008-01-14 01:14:09 UTC
(rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-dbus.c 2008-01-14 11:33:17 UTC
(rev 26570)
@@ -65,40 +65,16 @@
-static GObjectClass *mousepad_dbus_service_parent_class;
+G_DEFINE_TYPE (MousepadDBusService, mousepad_dbus_service, G_TYPE_OBJECT);
-GType
-mousepad_dbus_service_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (G_TYPE_OBJECT,
- I_("MousepadDBusService"),
- sizeof (MousepadDBusServiceClass),
- (GClassInitFunc)
mousepad_dbus_service_class_init,
- sizeof (MousepadDBusService),
- (GInstanceInitFunc)
mousepad_dbus_service_init,
- 0);
- }
-
- return type;
-}
-
-
-
static void
mousepad_dbus_service_class_init (MousepadDBusServiceClass *klass)
{
extern const DBusGObjectInfo dbus_glib_mousepad_dbus_service_object_info;
GObjectClass *gobject_class;
- /* determine the parent type class */
- mousepad_dbus_service_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_dbus_service_finalize;
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-document.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-document.c 2008-01-14
01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-document.c 2008-01-14
11:33:17 UTC (rev 26570)
@@ -103,8 +103,7 @@
-static GObjectClass *mousepad_document_parent_class;
-static guint document_signals[LAST_SIGNAL];
+static guint document_signals[LAST_SIGNAL];
@@ -116,27 +115,10 @@
-GType
-mousepad_document_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (MousepadDocument, mousepad_document, GTK_TYPE_SCROLLED_WINDOW);
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (GTK_TYPE_SCROLLED_WINDOW,
- I_("MousepadDocument"),
- sizeof (MousepadDocumentClass),
- (GClassInitFunc)
mousepad_document_class_init,
- sizeof (MousepadDocument),
- (GInstanceInitFunc)
mousepad_document_init,
- 0);
- }
- return type;
-}
-
-
static void
mousepad_document_class_init (MousepadDocumentClass *klass)
{
@@ -144,15 +126,13 @@
g_type_class_add_private (klass, sizeof (MousepadDocumentPrivate));
- mousepad_document_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_document_finalize;
document_signals[CLOSE_TAB] =
g_signal_new (I_("close-tab"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -160,7 +140,7 @@
document_signals[CURSOR_CHANGED] =
g_signal_new (I_("cursor-changed"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
_mousepad_marshal_VOID__INT_INT_INT,
G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
@@ -168,7 +148,7 @@
document_signals[SELECTION_CHANGED] =
g_signal_new (I_("selection-changed"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
@@ -176,7 +156,7 @@
document_signals[OVERWRITE_CHANGED] =
g_signal_new (I_("overwrite-changed"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-encoding-dialog.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-encoding-dialog.c
2008-01-14 01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-encoding-dialog.c
2008-01-14 11:33:17 UTC (rev 26570)
@@ -173,38 +173,15 @@
-static GObjectClass *mousepad_encoding_dialog_parent_class;
+G_DEFINE_TYPE (MousepadEncodingDialog, mousepad_encoding_dialog,
GTK_TYPE_DIALOG);
-GType
-mousepad_encoding_dialog_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (GTK_TYPE_DIALOG,
- I_("MousepadEncodingDialog"),
- sizeof
(MousepadEncodingDialogClass),
- (GClassInitFunc)
mousepad_encoding_dialog_class_init,
- sizeof (MousepadEncodingDialog),
- (GInstanceInitFunc)
mousepad_encoding_dialog_init,
- 0);
- }
-
- return type;
-}
-
-
-
static void
mousepad_encoding_dialog_class_init (MousepadEncodingDialogClass *klass)
{
- GObjectClass *gobject_class;
+ GObjectClass *gobject_class;
- mousepad_encoding_dialog_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_encoding_dialog_finalize;
}
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-file.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-file.c 2008-01-14 01:14:09 UTC
(rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-file.c 2008-01-14 11:33:17 UTC
(rev 26570)
@@ -39,7 +39,7 @@
enum
{
- EXTERNALLY_MODIFIED,
+ /* EXTERNALLY_MODIFIED, */
FILENAME_CHANGED,
LAST_SIGNAL
};
@@ -80,54 +80,37 @@
-static GObjectClass *mousepad_file_parent_class;
-static guint file_signals[LAST_SIGNAL];
+static guint file_signals[LAST_SIGNAL];
-GType
-mousepad_file_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (MousepadFile, mousepad_file, G_TYPE_OBJECT);
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (G_TYPE_OBJECT,
- I_("MousepadFile"),
- sizeof (MousepadFileClass),
- (GClassInitFunc)
mousepad_file_class_init,
- sizeof (MousepadFile),
- (GInstanceInitFunc)
mousepad_file_init,
- 0);
- }
- return type;
-}
-
-
static void
mousepad_file_class_init (MousepadFileClass *klass)
{
GObjectClass *gobject_class;
- mousepad_file_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_file_finalize;
+#if 0
+ /* TODO implement this signal */
file_signals[EXTERNALLY_MODIFIED] =
g_signal_new (I_("externally-modified"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#endif
file_signals[FILENAME_CHANGED] =
g_signal_new (I_("filename-changed"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-preferences.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-preferences.c 2008-01-14
01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-preferences.c 2008-01-14
11:33:17 UTC (rev 26570)
@@ -117,9 +117,6 @@
-static GObjectClass *mousepad_preferences_parent_class;
-
-
/**
* transform_string_to_boolean:
* @const GValue : String #GValue.
@@ -153,35 +150,15 @@
-GType
-mousepad_preferences_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (MousepadPreferences, mousepad_preferences, G_TYPE_OBJECT);
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (G_TYPE_OBJECT,
- I_("MousepadPreferences"),
- sizeof (MousepadPreferencesClass),
- (GClassInitFunc)
mousepad_preferences_class_init,
- sizeof (MousepadPreferences),
- (GInstanceInitFunc)
mousepad_preferences_init,
- 0);
- }
- return type;
-}
-
-
static void
mousepad_preferences_class_init (MousepadPreferencesClass *klass)
{
GObjectClass *gobject_class;
- /* determine the parent type class */
- mousepad_preferences_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_preferences_finalize;
gobject_class->get_property = mousepad_preferences_get_property;
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-print.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-print.c 2008-01-14
01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-print.c 2008-01-14
11:33:17 UTC (rev 26570)
@@ -100,39 +100,16 @@
-static GObjectClass *mousepad_print_parent_class;
+G_DEFINE_TYPE (MousepadPrint, mousepad_print, GTK_TYPE_PRINT_OPERATION);
-GType
-mousepad_print_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (GTK_TYPE_PRINT_OPERATION,
- I_("MousepadPrint"),
- sizeof (MousepadPrintClass),
- (GClassInitFunc)
mousepad_print_class_init,
- sizeof (MousepadPrint),
- (GInstanceInitFunc)
mousepad_print_init,
- 0);
- }
-
- return type;
-}
-
-
-
static void
mousepad_print_class_init (MousepadPrintClass *klass)
{
GObjectClass *gobject_class;
GtkPrintOperationClass *gtkprintoperation_class;
- mousepad_print_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_print_finalize;
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-private.h
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-private.h 2008-01-14
01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-private.h 2008-01-14
11:33:17 UTC (rev 26570)
@@ -31,10 +31,10 @@
#define MOUSEPAD_HAS_FLAG(flags,flag) (((flags) & (flag)) != 0)
/* for personal testing */
-#define TIMER_START GTimer *__FUNCTION__timer = g_timer_new();
-#define TIMER_SPLIT g_print ("%s (%s:%d): %.2f ms\n", __FUNCTION__, __FILE__,
__LINE__, g_timer_elapsed (__FUNCTION__timer, NULL) * 1000);
-#define TIMER_STOP TIMER_SPLIT g_timer_destroy (__FUNCTION__timer);
-#define PRINT_LINE g_print ("%d (%s)\n", __LINE__, __FUNCTION__);
+#define TIMER_START GTimer *__FUNCTION__timer = g_timer_new();
+#define TIMER_SPLIT g_print ("%s: %.2f ms\n", G_STRLOC, g_timer_elapsed
(__FUNCTION__timer, NULL) * 1000);
+#define TIMER_STOP TIMER_SPLIT g_timer_destroy (__FUNCTION__timer);
+#define PRINT_LOCATION g_print ("%s\n", G_STRLOC);
/* optimize the properties */
#define MOUSEPAD_PARAM_READWRITE (G_PARAM_READWRITE | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-replace-dialog.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-replace-dialog.c
2008-01-14 01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-replace-dialog.c
2008-01-14 11:33:17 UTC (rev 26570)
@@ -105,41 +105,20 @@
-static GObjectClass *mousepad_replace_dialog_parent_class;
-static GSList *history_list = NULL;
-static guint dialog_signals[LAST_SIGNAL];
+static GSList *history_list = NULL;
+static guint dialog_signals[LAST_SIGNAL];
-GType
-mousepad_replace_dialog_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (MousepadReplaceDialog, mousepad_replace_dialog,
GTK_TYPE_DIALOG);
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (GTK_TYPE_DIALOG,
- I_("MousepadReplaceDialog"),
- sizeof
(MousepadReplaceDialogClass),
- (GClassInitFunc)
mousepad_replace_dialog_class_init,
- sizeof (MousepadReplaceDialog),
- (GInstanceInitFunc)
mousepad_replace_dialog_init,
- 0);
- }
- return type;
-}
-
-
-
static void
mousepad_replace_dialog_class_init (MousepadReplaceDialogClass *klass)
{
GObjectClass *gobject_class;
GtkWidgetClass *gtkwidget_class;
- mousepad_replace_dialog_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_replace_dialog_finalize;
@@ -149,7 +128,7 @@
dialog_signals[SEARCH] =
g_signal_new (I_("search"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
_mousepad_marshal_INT__FLAGS_STRING_STRING,
G_TYPE_INT, 3,
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-search-bar.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-search-bar.c 2008-01-14
01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-search-bar.c 2008-01-14
11:33:17 UTC (rev 26570)
@@ -92,8 +92,7 @@
-static GObjectClass *mousepad_search_bar_parent_class;
-static guint search_bar_signals[LAST_SIGNAL];
+static guint search_bar_signals[LAST_SIGNAL];
@@ -108,35 +107,16 @@
-GType
-mousepad_search_bar_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (MousepadSearchBar, mousepad_search_bar, GTK_TYPE_TOOLBAR);
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (GTK_TYPE_TOOLBAR,
- I_("MousepadSearchBar"),
- sizeof (MousepadSearchBarClass),
- (GClassInitFunc)
mousepad_search_bar_class_init,
- sizeof (MousepadSearchBar),
- (GInstanceInitFunc)
mousepad_search_bar_init,
- 0);
- }
- return type;
-}
-
-
static void
mousepad_search_bar_class_init (MousepadSearchBarClass *klass)
{
GObjectClass *gobject_class;
GtkBindingSet *binding_set;
- mousepad_search_bar_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_search_bar_finalize;
@@ -144,7 +124,7 @@
search_bar_signals[HIDE_BAR] =
g_signal_new (I_("hide-bar"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS | G_SIGNAL_ACTION,
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0, NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -152,7 +132,7 @@
search_bar_signals[SEARCH] =
g_signal_new (I_("search"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
_mousepad_marshal_INT__FLAGS_STRING_STRING,
G_TYPE_INT, 3,
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-statusbar.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-statusbar.c 2008-01-14
01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-statusbar.c 2008-01-14
11:33:17 UTC (rev 26570)
@@ -63,6 +63,10 @@
+G_DEFINE_TYPE (MousepadStatusbar, mousepad_statusbar, GTK_TYPE_STATUSBAR);
+
+
+
GtkWidget *
mousepad_statusbar_new (void)
{
@@ -71,38 +75,17 @@
-GType
-mousepad_statusbar_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (GTK_TYPE_STATUSBAR,
- I_("MousepadStatusbar"),
- sizeof (MousepadStatusbarClass),
- (GClassInitFunc)
mousepad_statusbar_class_init,
- sizeof (MousepadStatusbar),
- (GInstanceInitFunc)
mousepad_statusbar_init,
- 0);
- }
-
- return type;
-}
-
-
-
static void
mousepad_statusbar_class_init (MousepadStatusbarClass *klass)
{
- GObjectClass *gobject_class;
+ GObjectClass *gobject_class;
gobject_class = G_OBJECT_CLASS (klass);
statusbar_signals[ENABLE_OVERWRITE] =
g_signal_new (I_("enable-overwrite"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-undo.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-undo.c 2008-01-14 01:14:09 UTC
(rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-undo.c 2008-01-14 11:33:17 UTC
(rev 26570)
@@ -156,46 +156,25 @@
-static GObjectClass *mousepad_undo_parent_class;
-static guint undo_signals[LAST_SIGNAL];
+static guint undo_signals[LAST_SIGNAL];
-GType
-mousepad_undo_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (MousepadUndo, mousepad_undo, G_TYPE_OBJECT);
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (G_TYPE_OBJECT,
- I_("MousepadUndo"),
- sizeof (MousepadUndoClass),
- (GClassInitFunc)
mousepad_undo_class_init,
- sizeof (MousepadUndo),
- (GInstanceInitFunc)
mousepad_undo_init,
- 0);
- }
- return type;
-}
-
-
-
static void
mousepad_undo_class_init (MousepadUndoClass *klass)
{
GObjectClass *gobject_class;
- mousepad_undo_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_undo_finalize;
undo_signals[CAN_UNDO] =
g_signal_new (I_("can-undo"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
@@ -203,7 +182,7 @@
undo_signals[CAN_REDO] =
g_signal_new (I_("can-redo"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-view.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-view.c 2008-01-14 01:14:09 UTC
(rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-view.c 2008-01-14 11:33:17 UTC
(rev 26570)
@@ -131,39 +131,16 @@
-static GObjectClass *mousepad_view_parent_class;
+G_DEFINE_TYPE (MousepadView, mousepad_view, GTK_TYPE_TEXT_VIEW);
-GType
-mousepad_view_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (GTK_TYPE_TEXT_VIEW,
- I_("MousepadView"),
- sizeof (MousepadViewClass),
- (GClassInitFunc)
mousepad_view_class_init,
- sizeof (MousepadView),
- (GInstanceInitFunc)
mousepad_view_init,
- 0);
- }
-
- return type;
-}
-
-
-
static void
mousepad_view_class_init (MousepadViewClass *klass)
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- mousepad_view_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = mousepad_view_finalize;
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-window.c
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-window.c 2008-01-14
01:14:09 UTC (rev 26569)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-window.c 2008-01-14
11:33:17 UTC (rev 26570)
@@ -63,7 +63,6 @@
{
NEW_WINDOW,
NEW_WINDOW_WITH_DOCUMENT,
- HAS_DOCUMENTS,
LAST_SIGNAL,
};
@@ -398,7 +397,7 @@
{ "save-as", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<shift><control>S",
N_("Save current document as another file"), G_CALLBACK
(mousepad_window_action_save_as), },
{ "save-all", NULL, N_("Save A_ll"), NULL, N_("Save all document in this
window"), G_CALLBACK (mousepad_window_action_save_all), },
{ "revert", GTK_STOCK_REVERT_TO_SAVED, N_("Re_vert"), NULL, N_("Revert to
the saved version of the file"), G_CALLBACK (mousepad_window_action_revert), },
- { "print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P", N_("Prin the
current document"), G_CALLBACK (mousepad_window_action_print), },
+ { "print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P", N_("Print the
current document"), G_CALLBACK (mousepad_window_action_print), },
{ "detach", NULL, N_("_Detach Tab"), "<control>D", N_("Move the current
document to a new window"), G_CALLBACK (mousepad_window_action_detach), },
{ "close", GTK_STOCK_CLOSE, N_("Close _Tab"), "<control>W", N_("Close the
current document"), G_CALLBACK (mousepad_window_action_close), },
{ "close-window", GTK_STOCK_QUIT, N_("_Close Window"), "<control>Q",
N_("Close this window"), G_CALLBACK (mousepad_window_action_close_window), },
@@ -437,8 +436,8 @@
{ "line-up", NULL, N_("Line _Up"), NULL, N_("Move the selection one line
up"), G_CALLBACK (mousepad_window_action_move_line_up), },
{ "line-down", NULL, N_("Line _Down"), NULL, N_("Move the selection one
line down"), G_CALLBACK (mousepad_window_action_move_line_down), },
{ "duplicate", NULL, N_("D_uplicate Line / Selection"), NULL,
N_("Duplicate the current line or selection"), G_CALLBACK
(mousepad_window_action_duplicate), },
- { "increase-indent", GTK_STOCK_INDENT, N_("_Increase Indent"), NULL,
N_("Increase indent of selection or line"), G_CALLBACK
(mousepad_window_action_increase_indent), },
- { "decrease-indent", GTK_STOCK_UNINDENT, N_("_Decrease Indent"), NULL,
N_("Decrease indent of selection or line"), G_CALLBACK
(mousepad_window_action_decrease_indent), },
+ { "increase-indent", GTK_STOCK_INDENT, N_("_Increase Indent"), NULL,
N_("Increase the indentation of the selection or current line"), G_CALLBACK
(mousepad_window_action_increase_indent), },
+ { "decrease-indent", GTK_STOCK_UNINDENT, N_("_Decrease Indent"), NULL,
N_("Decrease the indentation of the selection or current line"), G_CALLBACK
(mousepad_window_action_decrease_indent), },
{ "document-menu", NULL, N_("_Document"), NULL, NULL, NULL, },
{ "tab-size-menu", NULL, N_("Tab _Size"), NULL, NULL, NULL, },
@@ -473,14 +472,17 @@
/* global variables */
-static GObjectClass *mousepad_window_parent_class;
-static guint window_signals[LAST_SIGNAL];
-static gint lock_menu_updates = 0;
-static GSList *clipboard_history = NULL;
-static guint clipboard_history_ref_count = 0;
+static guint window_signals[LAST_SIGNAL];
+static gint lock_menu_updates = 0;
+static GSList *clipboard_history = NULL;
+static guint clipboard_history_ref_count = 0;
+G_DEFINE_TYPE (MousepadWindow, mousepad_window, GTK_TYPE_WINDOW);
+
+
+
GtkWidget *
mousepad_window_new (void)
{
@@ -489,35 +491,12 @@
-GType
-mousepad_window_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_type_register_static_simple (GTK_TYPE_WINDOW,
- I_("MousepadWindow"),
- sizeof (MousepadWindowClass),
- (GClassInitFunc)
mousepad_window_class_init,
- sizeof (MousepadWindow),
- (GInstanceInitFunc)
mousepad_window_init,
- 0);
- }
-
- return type;
-}
-
-
-
static void
mousepad_window_class_init (MousepadWindowClass *klass)
{
GObjectClass *gobject_class;
GtkWidgetClass *gtkwidget_class;
- mousepad_window_parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->dispose = mousepad_window_dispose;
gobject_class->finalize = mousepad_window_finalize;
@@ -528,7 +507,7 @@
window_signals[NEW_WINDOW] =
g_signal_new (I_("new-window"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -536,21 +515,12 @@
window_signals[NEW_WINDOW_WITH_DOCUMENT] =
g_signal_new (I_("new-window-with-document"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
+ G_SIGNAL_RUN_LAST,
0, NULL, NULL,
_mousepad_marshal_VOID__OBJECT_INT_INT,
G_TYPE_NONE, 3,
G_TYPE_OBJECT,
G_TYPE_INT, G_TYPE_INT);
-
- window_signals[HAS_DOCUMENTS] =
- g_signal_new (I_("has-documents"),
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_NO_HOOKS,
- 0, NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1,
- G_TYPE_BOOLEAN);
}
@@ -997,6 +967,9 @@
/* new document */
document = mousepad_document_new ();
+ /* make sure it's not a floating object */
+ g_object_ref_sink (G_OBJECT (document));
+
/* set the filename */
mousepad_file_set_filename (document->file, filename);
@@ -1751,6 +1724,8 @@
dirs_list = g_slist_insert_sorted (dirs_list, absolute_path,
(GCompareFunc) strcmp);
else if (g_file_test (absolute_path, G_FILE_TEST_IS_REGULAR))
files_list = g_slist_insert_sorted (files_list, absolute_path,
(GCompareFunc) strcmp);
+ else
+ g_free (absolute_path);
}
/* close the directory */
@@ -2617,7 +2592,7 @@
working_directory = g_get_current_dir ();
/* open the files */
- mousepad_window_open_files (window, NULL, uris);
+ mousepad_window_open_files (window, working_directory, uris);
/* cleanup */
g_free (working_directory);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
