Sync the g2 branch with the gnome2-merge-1 tag.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gnucash-gnome2-dev@8898 57a11ea4-9604-0410-9ed3-97b8803252fd

src/gnome-utils/dialog-query-list.c

@@ -187,7 +187,7 @@ gnc_dialog_query_list_new (GList *param_list, Query *q)
 
   /* connect the double-click signal of the qlist */
   gtk_signal_connect (GTK_OBJECT (dql->qlist), "double_click_entry",
-		      gnc_dialog_query_list_double_click_entry, dql);
+		      GTK_SIGNAL_FUNC(gnc_dialog_query_list_double_click_entry), dql);
   
 
   /* connect to the close button */
@@ -246,7 +246,7 @@ void gnc_dialog_query_list_set_buttons (DialogQueryList *dql,
     button = gtk_button_new_with_label (buttons[i].label);
     gtk_object_set_data (GTK_OBJECT (button), "data", &(dql->buttons[i]));
     gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			gnc_dialog_query_list_button_clicked, dql);
+			GTK_SIGNAL_FUNC(gnc_dialog_query_list_button_clicked), dql);
     gtk_box_pack_start (GTK_BOX (dql->button_box), button, FALSE, FALSE, 3);
   }
 }

src/gnome-utils/gnc-date-format.c

@@ -119,15 +119,20 @@ gnc_date_format_class_init (GNCDateFormatClass *class)
   parent_class = gtk_type_class (gtk_hbox_get_type ());
 
   date_format_signals [FORMAT_CHANGED] =
-    gtk_signal_new ("format_changed",
-		    GTK_RUN_FIRST, object_class->type, 
-		    GTK_SIGNAL_OFFSET (GNCDateFormatClass,
-				       format_changed),
-		    gtk_signal_default_marshaller,
-		    GTK_TYPE_NONE, 0);
-
+    g_signal_new ("format_changed",
+		  G_OBJECT_CLASS_TYPE (object_class),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GNCDateFormatClass, format_changed),
+		  NULL,
+		  NULL,
+		  g_cclosure_marshal_VOID__POINTER,
+		  G_TYPE_NONE,
+		  0);
+
+#if 0
   gtk_object_class_add_signals (object_class, date_format_signals,
 				LAST_SIGNAL);
+#endif
 
   object_class->destroy = gnc_date_format_destroy;
 
@@ -171,7 +176,7 @@ gnc_date_format_init (GNCDateFormat *gdf)
 
   /* Initialize the format menu */
   gnc_option_menu_init_w_signal(gdf->priv->format_omenu,
-				gnc_ui_date_format_changed_cb, gdf);
+				GTK_SIGNAL_FUNC(gnc_ui_date_format_changed_cb), gdf);
 
   /* Set initial format to gnucash default */
   gnc_date_format_set_format(gdf, getDateFormat());
@@ -501,5 +506,5 @@ gnc_date_format_compute_format(GNCDateFormat *gdf)
   gnc_date_format_refresh(gdf);
 
   /* Emit a signal that we've changed */
-  gtk_signal_emit(GTK_OBJECT(gdf), date_format_signals[FORMAT_CHANGED]);
+  g_signal_emit(G_OBJECT(gdf), date_format_signals[FORMAT_CHANGED], 0);
 }

src/gnome-utils/gnc-query-list.c

@@ -262,7 +262,9 @@ gnc_query_list_init_clist (GNCQueryList *list)
   }
 
   /* construct the clist */
+#if NEEDS_FIXING_IN_G2
   gtk_clist_construct (clist, list->num_columns, titles);
+#endif
   gtk_clist_set_shadow_type (clist, GTK_SHADOW_IN);
 
   /* build all the column titles */
@@ -290,6 +292,7 @@ gnc_query_list_init_clist (GNCQueryList *list)
 
   style = gtk_widget_get_style (GTK_WIDGET(list));
 
+#if 0
   {
     GdkFont *font = NULL;
     gint width;
@@ -308,6 +311,7 @@ gnc_query_list_init_clist (GNCQueryList *list)
       }
     }
   }
+#endif
   g_free(titles);
 }
 
@@ -327,28 +331,32 @@ gnc_query_list_class_init (GNCQueryListClass *klass)
   parent_class = gtk_type_class(GTK_TYPE_CLIST);
 
   query_list_signals[LINE_TOGGLED] =
-    gtk_signal_new("line_toggled",
-		   GTK_RUN_FIRST,
-		   object_class->type,
-		   GTK_SIGNAL_OFFSET(GNCQueryListClass,
-				     line_toggled),
-		   gtk_marshal_NONE__POINTER,
-		   GTK_TYPE_NONE, 1,
-		   GTK_TYPE_POINTER);
+    g_signal_new("line_toggled",
+		 G_TYPE_FROM_CLASS (object_class),
+		 G_SIGNAL_RUN_FIRST,
+		 G_STRUCT_OFFSET(GNCQueryListClass, line_toggled),
+		 NULL, NULL,
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE,
+		 1,
+		 G_TYPE_POINTER);
 
   query_list_signals[DOUBLE_CLICK_ENTRY] =
-    gtk_signal_new("double_click_entry",
-		   GTK_RUN_FIRST,
-		   object_class->type,
-		   GTK_SIGNAL_OFFSET(GNCQueryListClass,
-				     double_click_entry),
-		   gtk_marshal_NONE__POINTER,
-		   GTK_TYPE_NONE, 1,
-		   GTK_TYPE_POINTER);
-
+    g_signal_new("double_click_entry",
+		 G_TYPE_FROM_CLASS (object_class),
+		 G_SIGNAL_RUN_FIRST,
+		 G_STRUCT_OFFSET(GNCQueryListClass, double_click_entry),
+		 NULL, NULL,
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE,
+		 1,
+		 G_TYPE_POINTER);
+
+#if 0
   gtk_object_class_add_signals(object_class,
 			       query_list_signals,
 			       LAST_SIGNAL);
+#endif
 
   object_class->destroy = gnc_query_list_destroy;
 
@@ -490,7 +498,7 @@ gnc_query_list_get_needed_height (GNCQueryList *list, gint num_rows)
 
   /* sync with gtkclist.c */
   title_height = (clist->column_title_area.height +
-                  (GTK_WIDGET(list)->style->klass->ythickness +
+                  (GTK_WIDGET(list)->style->ythickness +
                    GTK_CONTAINER(list)->border_width) * 2);
   list_height = (clist->row_height * num_rows) + (num_rows + 1);
 

src/import-export/log-replay/Makefile.am

@@ -31,7 +31,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/import-export \
-  ${GNOME_INCLUDEDIR} \
+  ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \