[dia] GTK_DISABLE_DEPRECTAED still needed for the non-gnome case, too.
- From: Hans Breuer <hans src gnome org>
- To: svn-commits-list gnome org
- Subject: [dia] GTK_DISABLE_DEPRECTAED still needed for the non-gnome case, too.
- Date: Sun, 24 May 2009 08:35:12 -0400 (EDT)
commit 9a8ac572d4ee81cb4d7643af74a32cdcee45a6a1
Author: Hans Breuer <hans breuer org>
Date: Sun May 24 14:34:32 2009 +0200
GTK_DISABLE_DEPRECTAED still needed for the non-gnome case, too.
---
app/interface.c | 1 +
objects/SISSI/sissi_dialog.c | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/interface.c b/app/interface.c
index 81966f3..3ee5b70 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -22,6 +22,7 @@
#undef GTK_DISABLE_DEPRECATED /* gnome */
#include <gnome.h>
#else
+#undef GTK_DISABLE_DEPRECATED /* e.g. GTK_SIGNAL_FUNC */
#include <gtk/gtk.h>
#endif
#include "gtkwrapbox.h"
diff --git a/objects/SISSI/sissi_dialog.c b/objects/SISSI/sissi_dialog.c
index 8298332..333a025 100644
--- a/objects/SISSI/sissi_dialog.c
+++ b/objects/SISSI/sissi_dialog.c
@@ -903,7 +903,7 @@ static void switch_page_callback(GtkNotebook *notebook, GtkNotebookPage *page)
}
}
-static void
+static void
destroy_properties_dialog (GtkWidget* widget, gpointer user_data)
{
@@ -918,7 +918,7 @@ destroy_properties_dialog (GtkWidget* widget, gpointer user_data)
gtk_widget_destroy(object_sissi->properties_dialog->entity);
gtk_widget_destroy((GtkWidget *)object_sissi->properties_dialog->name);
- g_free(object_sissi->properties_dialog);
+ g_free(object_sissi->properties_dialog);
object_sissi->properties_dialog = NULL;
}
@@ -1098,7 +1098,7 @@ static void fill_in_dialog(ObjetSISSI *object_sissi)
}
/* apply the properties of dialog box to Object */
-ObjectChange *
+ObjectChange *
object_sissi_apply_properties_dialog(ObjetSISSI *object_sissi)
{
SISSIDialog *prop_dialog;
@@ -1108,9 +1108,9 @@ object_sissi_apply_properties_dialog(ObjetSISSI *object_sissi)
GList *disconnected = NULL;
SISSIState *old_state = NULL;
prop_dialog = object_sissi->properties_dialog;
-
-
- g_return_val_if_fail(prop_dialog != NULL, NULL);
+
+
+ g_return_val_if_fail(prop_dialog != NULL, NULL);
obj = &object_sissi->element.object;
properties_menaces_read_from_dialog(object_sissi, prop_dialog);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]