[gnome-applets/gtk3: 14/23] charpick: Fix build with gtk3

[Christian Persch <chpe src gnome org>]

commit 865e2755e72fb281cd3ca5c753c402e58604c96a
Author: Christian Persch <chpe gnome org>
Date:   Thu Oct 28 14:21:03 2010 +0200

    charpick: Fix build with gtk3

 charpick/Makefile.am  |    2 +-
 charpick/properties.c |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index f305714..9093db1 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -45,7 +45,7 @@ schemas_in_files = charpick.schemas.in
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
-uidir = $(datadir)/gnome-2.0/ui
+uidir = $(pkgdatadir)/ui
 ui_DATA = charpick-applet-menu.xml
 
 EXTRA_DIST =							\
diff --git a/charpick/properties.c b/charpick/properties.c
index c3bd475..47f0f32 100644
--- a/charpick/properties.c
+++ b/charpick/properties.c
@@ -92,8 +92,7 @@ add_edit_dialog_create (charpick_data *curr_data, gchar *string, gchar *title)
 	GtkWidget *label;
 
 	dialog = gtk_dialog_new_with_buttons (_(title), GTK_WINDOW (curr_data->propwindow),
-							    GTK_DIALOG_DESTROY_WITH_PARENT |
-							    GTK_DIALOG_NO_SEPARATOR, 
+							    GTK_DIALOG_DESTROY_WITH_PARENT,
 							    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 							    GTK_STOCK_OK, GTK_RESPONSE_OK,
 							    NULL);
@@ -550,7 +549,6 @@ show_preferences_dialog (GtkAction     *action,
   gtk_container_set_border_width (GTK_CONTAINER (curr_data->propwindow), 5);
   gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (curr_data->propwindow))), 2);
   gtk_dialog_set_default_response (GTK_DIALOG (curr_data->propwindow), GTK_RESPONSE_CLOSE);
-  gtk_dialog_set_has_separator (GTK_DIALOG (curr_data->propwindow), FALSE);
 
   default_chars_frame_create(curr_data);
   g_signal_connect (G_OBJECT (curr_data->propwindow), "response",