[dia] Warningectomy: g_object_get_data wnats G_OBJECT()
- From: Hans Breuer <hans src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [dia] Warningectomy: g_object_get_data wnats G_OBJECT()
- Date: Fri, 31 Jul 2009 16:58:44 +0000 (UTC)
commit 45e17a2897f6c3b687dbcb71981a0277bcaba28a
Author: Hans Breuer <hans breuer org>
Date: Fri Jul 31 18:58:43 2009 +0200
Warningectomy: g_object_get_data wnats G_OBJECT()
warning: passing argument 1 of 'g_object_get_data' from incompatible
pointer type (introduced by deprecate symbol replacement)
app/menus.c | 2 +-
objects/Database/table_dialog.c | 2 +-
objects/SISSI/sissi_dialog.c | 6 +++---
objects/UML/class_dialog.c | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/app/menus.c b/app/menus.c
index a49b040..8ba7086 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -817,7 +817,7 @@ _ui_manager_connect_proxy (GtkUIManager *manager,
}
}
-GtkActionGroup *
+static GtkActionGroup *
create_or_ref_display_actions (void)
{
if (display_actions)
diff --git a/objects/Database/table_dialog.c b/objects/Database/table_dialog.c
index 049a457..2d25029 100644
--- a/objects/Database/table_dialog.c
+++ b/objects/Database/table_dialog.c
@@ -901,7 +901,7 @@ attributes_list_selection_changed_cb (GtkWidget * gtklist, Table * table)
else
{
list_item = GTK_OBJECT (list->data);
- attr = (TableAttribute *) g_object_get_data (list_item, "user_data");
+ attr = (TableAttribute *) g_object_get_data (G_OBJECT(list_item), "user_data");
attributes_page_set_sensitive (prop_dialog, TRUE);
attributes_page_set_values (prop_dialog, attr);
diff --git a/objects/SISSI/sissi_dialog.c b/objects/SISSI/sissi_dialog.c
index 7999ade..31cd9ed 100644
--- a/objects/SISSI/sissi_dialog.c
+++ b/objects/SISSI/sissi_dialog.c
@@ -378,21 +378,21 @@ static void properties_others_read_from_dialog(ObjetSISSI *object_sissi, SISSIDi
/************** classification list box *************/
if (GTK_IS_OPTION_MENU(object_sissi->properties_dialog->confidentiality)) {
object_sissi->confidentiality = g_strdup((char *)(g_object_get_data(
- GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->confidentiality)->menu_item), "user_data")));
+ G_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->confidentiality)->menu_item), "user_data")));
} else {
object_sissi->confidentiality = g_strdup((char *)strtol(gtk_entry_get_text(GTK_ENTRY(object_sissi->properties_dialog->confidentiality)), NULL, 0));
}
if (GTK_IS_OPTION_MENU(object_sissi->properties_dialog->integrity)) {
object_sissi->integrity = g_strdup((char *)(g_object_get_data(
- GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->integrity)->menu_item), "user_data")));
+ G_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->integrity)->menu_item), "user_data")));
} else {
object_sissi->integrity = g_strdup((char *)strtol(gtk_entry_get_text(GTK_ENTRY(object_sissi->properties_dialog->integrity)), NULL, 0));
}
if (GTK_IS_OPTION_MENU(object_sissi->properties_dialog->disponibility_level)) {
object_sissi->disponibility_level = g_strdup((char *)(g_object_get_data(
- GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->disponibility_level)->menu_item), "user_data")));
+ G_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->disponibility_level)->menu_item), "user_data")));
} else {
object_sissi->disponibility_level = g_strdup((char *)strtol(gtk_entry_get_text(GTK_ENTRY(object_sissi->properties_dialog->disponibility_level)), NULL, 0));
}
diff --git a/objects/UML/class_dialog.c b/objects/UML/class_dialog.c
index 4071731..284e915 100644
--- a/objects/UML/class_dialog.c
+++ b/objects/UML/class_dialog.c
@@ -779,7 +779,7 @@ attributes_list_selection_changed_callback(GtkWidget *gtklist,
}
list_item = GTK_OBJECT(list->data);
- attr = (UMLAttribute *)g_object_get_data(list_item, "user_data");
+ attr = (UMLAttribute *)g_object_get_data(G_OBJECT(list_item), "user_data");
attributes_set_values(prop_dialog, attr);
attributes_set_sensitive(prop_dialog, TRUE);
@@ -1359,7 +1359,7 @@ parameters_list_selection_changed_callback(GtkWidget *gtklist,
}
list_item = GTK_OBJECT(list->data);
- param = (UMLParameter *)g_object_get_data(list_item, "user_data");
+ param = (UMLParameter *)g_object_get_data(G_OBJECT(list_item), "user_data");
parameters_set_values(prop_dialog, param);
parameters_set_sensitive(prop_dialog, TRUE);
@@ -1715,7 +1715,7 @@ operations_list_selection_changed_callback(GtkWidget *gtklist,
}
list_item = GTK_OBJECT(list->data);
- op = (UMLOperation *)g_object_get_data(list_item, "user_data");
+ op = (UMLOperation *)g_object_get_data(G_OBJECT(list_item), "user_data");
operations_set_values(prop_dialog, op);
operations_set_sensitive(prop_dialog, TRUE);
@@ -2537,7 +2537,7 @@ templates_list_selection_changed_callback(GtkWidget *gtklist,
}
list_item = GTK_OBJECT(list->data);
- param = (UMLFormalParameter *)g_object_get_data(list_item, "user_data");
+ param = (UMLFormalParameter *)g_object_get_data(G_OBJECT(list_item), "user_data");
templates_set_values(prop_dialog, param);
templates_set_sensitive(prop_dialog, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]