gucharmap r1654 - trunk/gucharmap
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gucharmap r1654 - trunk/gucharmap
- Date: Fri, 21 Mar 2008 10:51:12 +0000 (GMT)
Author: chpe
Date: Fri Mar 21 10:51:12 2008
New Revision: 1654
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1654&view=rev
Log:
Remove unused static variables.
Modified:
trunk/gucharmap/gucharmap-search-dialog.c
trunk/gucharmap/gucharmap-window.c
Modified: trunk/gucharmap/gucharmap-search-dialog.c
==============================================================================
--- trunk/gucharmap/gucharmap-search-dialog.c (original)
+++ trunk/gucharmap/gucharmap-search-dialog.c Fri Mar 21 10:51:12 2008
@@ -38,8 +38,7 @@
NUM_SIGNALS
};
-static guint gucharmap_search_dialog_signals[NUM_SIGNALS] = { 0, 0 };
-static GObjectClass *parent_class;
+static guint gucharmap_search_dialog_signals[NUM_SIGNALS];
enum
{
@@ -89,6 +88,10 @@
GtkWidget *next_button;
};
+static void gucharmap_search_dialog_class_init (GucharmapSearchDialogClass *klass);
+static void gucharmap_search_dialog_init (GucharmapSearchDialog *dialog);
+
+G_DEFINE_TYPE (GucharmapSearchDialog, gucharmap_search_dialog, GTK_TYPE_DIALOG)
static const gchar *
utf8_strcasestr (const gchar *haystack,
@@ -825,7 +828,7 @@
if (priv->search_state)
gucharmap_search_state_free (priv->search_state);
- parent_class->finalize (object);
+ G_OBJECT_CLASS (gucharmap_search_dialog_parent_class)->finalize (object);
}
static void
@@ -833,8 +836,6 @@
{
g_type_class_add_private (clazz, sizeof (GucharmapSearchDialogPrivate));
- parent_class = (GObjectClass *) g_type_class_peek_parent (clazz);
-
G_OBJECT_CLASS (clazz)->finalize = gucharmap_search_dialog_finalize;
clazz->search_start = NULL;
@@ -850,9 +851,7 @@
g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT);
}
-G_DEFINE_TYPE (GucharmapSearchDialog, gucharmap_search_dialog, GTK_TYPE_DIALOG)
-
-GtkWidget *
+GtkWidget *
gucharmap_search_dialog_new (GucharmapWindow *guw)
{
GucharmapSearchDialog *search_dialog = g_object_new (gucharmap_search_dialog_get_type (), NULL);
Modified: trunk/gucharmap/gucharmap-window.c
==============================================================================
--- trunk/gucharmap/gucharmap-window.c (original)
+++ trunk/gucharmap/gucharmap-window.c Fri Mar 21 10:51:12 2008
@@ -65,9 +65,12 @@
ChaptersMode chapters_mode;
};
-GdkCursor * _gucharmap_window_progress_cursor (void);
+static void gucharmap_window_class_init (GucharmapWindowClass *klass);
+static void gucharmap_window_init (GucharmapWindow *window);
+
+G_DEFINE_TYPE (GucharmapWindow, gucharmap_window, GTK_TYPE_WINDOW)
-static GtkWindowClass *parent_class = NULL;
+GdkCursor * _gucharmap_window_progress_cursor (void);
static void
status_message (GtkWidget *widget,
@@ -976,20 +979,18 @@
g_free (priv->last_search);
*/
#endif
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gucharmap_window_parent_class)->finalize (object);
}
static void
gucharmap_window_class_init (GucharmapWindowClass *clazz)
{
- parent_class = g_type_class_peek_parent (clazz);
GTK_WIDGET_CLASS (clazz)->show_all = show_all;
G_OBJECT_CLASS (clazz)->finalize = window_finalize;
+
g_type_class_add_private (clazz, sizeof (GucharmapWindowPrivate));
}
-G_DEFINE_TYPE (GucharmapWindow, gucharmap_window, GTK_TYPE_WINDOW)
-
GtkWidget *
gucharmap_window_new (void)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]