libbonoboui r2649 - in trunk: . samples/canvdemo samples/compound-doc tests tests/control tools/browser

[kmaraas svn gnome org]

Author: kmaraas
Date: Thu Aug 28 11:00:52 2008
New Revision: 2649
URL: http://svn.gnome.org/viewvc/libbonoboui?rev=2649&view=rev

Log:
2008-08-28  Kjartan Maraas  <kmaraas gnome org>

	* samples/canvdemo/main.c: (create_app), (main):
	Remove some unused vars (Andreas KÃhler)
	* samples/compound-doc/paint-component-simple.c:
	(update_view_foreach), (view_factory), (render_fn):
	* tests/control/test-control.c: (test_gtk_weakrefs):
	* tests/dock_demo.c: (delete_callback), (main):
	Don't use deprecated glib/gtk+ api.
	* tests/test-moniker.c: (main):
	Add missing fprintf format specifier.
	* tools/browser/oaf-helper.c: (get_string_value),
	(bonobo_component_get_locale_name),
	(bonobo_component_get_locale_desc), (num_query_matches),
	(is_component_active), (bonobo_component_get_repoids):
	More Cleanups (TM).

Modified:
   trunk/ChangeLog
   trunk/samples/canvdemo/main.c
   trunk/samples/compound-doc/paint-component-simple.c
   trunk/tests/control/test-control.c
   trunk/tests/dock_demo.c
   trunk/tests/test-moniker.c
   trunk/tools/browser/oaf-helper.c

Modified: trunk/samples/canvdemo/main.c
==============================================================================
--- trunk/samples/canvdemo/main.c	(original)
+++ trunk/samples/canvdemo/main.c	Thu Aug 28 11:00:52 2008
@@ -182,7 +182,6 @@
 create_app (void)
 {
 	GtkWidget *canvas, *window, *box, *hbox, *control; 
-        GnomeCanvasGroup *group;
 	
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	g_signal_connect (G_OBJECT(window), "destroy", 
@@ -214,8 +213,6 @@
 int 
 main (int argc, char** argv)
 {
-	CORBA_ORB orb;
-	
         if (!bonobo_ui_init (argv[0], VERSION, &argc, argv))
                 g_error ("Could not initialize libbonoboui!\n");
 

Modified: trunk/samples/compound-doc/paint-component-simple.c
==============================================================================
--- trunk/samples/compound-doc/paint-component-simple.c	(original)
+++ trunk/samples/compound-doc/paint-component-simple.c	Thu Aug 28 11:00:52 2008
@@ -115,7 +115,7 @@
 {
 	view_data_t *view_data;
 
-	view_data = gtk_object_get_data (GTK_OBJECT (view), "view_data");
+	view_data = g_object_get_data (G_OBJECT (view), "view_data");
 	view_update (view_data);
 }
 
@@ -460,7 +460,7 @@
 	 */
 	view = bonobo_view_new (vbox);
 	view_data->view = view;
-	gtk_object_set_data (GTK_OBJECT (view), "view_data", view_data);
+	g_object_set_data (G_OBJECT (view), "view_data", view_data);
 
 	/*
 	 * When our container wants to activate a given view of this
@@ -507,7 +507,7 @@
 	gnome_print_moveto (ctx, (width / 2) - (w / 2),
 			    height / 2);
 	gnome_print_show (ctx, str);
-	gtk_object_unref (GTK_OBJECT (font));
+	g_object_unref (G_OBJECT (font));
 
 	gnome_print_moveto (ctx, 0, 0);
 	gnome_print_lineto (ctx, width, height);

Modified: trunk/tests/control/test-control.c
==============================================================================
--- trunk/tests/control/test-control.c	(original)
+++ trunk/tests/control/test-control.c	Thu Aug 28 11:00:52 2008
@@ -319,8 +319,7 @@
 	GtkObject *object = g_object_new (GTK_TYPE_BUTTON, NULL);
 
 	ref = object;
-	gtk_object_ref (object);
-	gtk_object_sink (object);
+	g_object_ref_sink (object);
 	g_object_add_weak_pointer (ref, &ref);
 	gtk_object_destroy (object);
 	g_object_unref (object);

Modified: trunk/tests/dock_demo.c
==============================================================================
--- trunk/tests/dock_demo.c	(original)
+++ trunk/tests/dock_demo.c	Thu Aug 28 11:00:52 2008
@@ -63,7 +63,7 @@
   gnome_config_set_string ("Dock/Placement", layout_string);
   gnome_config_sync ();
 
-  gtk_object_unref (GTK_OBJECT (layout));
+  g_object_unref (G_OBJECT (layout));
 
   gtk_main_quit ();
 }
@@ -166,21 +166,21 @@
   gnome_dock_layout_add_to_dock (GNOME_DOCK_LAYOUT (layout),
                                  GNOME_DOCK (dock));
 
-  gtk_object_unref (GTK_OBJECT(layout));
+  g_object_unref (G_OBJECT (layout));
 
   client_frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type(GTK_FRAME (client_frame), GTK_SHADOW_IN);
   drawing_area = gtk_drawing_area_new();
 
-  g_signal_connect (GTK_OBJECT (app),
-                      "delete_event",
-                      G_CALLBACK (delete_callback),
-                      NULL);
-
-  g_signal_connect (GTK_OBJECT (dock),
-                      "layout_changed",
-                      G_CALLBACK (layout_changed_callback),
-                      NULL);
+  g_signal_connect (G_OBJECT (app),
+                    "delete_event",
+                    G_CALLBACK (delete_callback),
+                    NULL);
+
+  g_signal_connect (G_OBJECT (dock),
+                    "layout_changed",
+                    G_CALLBACK (layout_changed_callback),
+                    NULL);
 
   gnome_dock_set_client_area (GNOME_DOCK (dock), client_frame);
   gtk_widget_show (client_frame);

Modified: trunk/tests/test-moniker.c
==============================================================================
--- trunk/tests/test-moniker.c	(original)
+++ trunk/tests/test-moniker.c	Thu Aug 28 11:00:52 2008
@@ -311,7 +311,7 @@
 	fprintf (stderr, "Resolving moniker '%s' as ", global_mto.requested_moniker);
 	switch (global_mto.display_as) {
         case AS_INTERFACE:
-		fprintf (stderr, global_mto.requested_interface);
+		fprintf (stderr, "%s", global_mto.requested_interface);
 		break;
         case AS_STREAM:
 		fprintf (stderr, "IDL:Bonobo/Stream:1.0");

Modified: trunk/tools/browser/oaf-helper.c
==============================================================================
--- trunk/tools/browser/oaf-helper.c	(original)
+++ trunk/tools/browser/oaf-helper.c	Thu Aug 28 11:00:52 2008
@@ -38,14 +38,14 @@
 
 	for (temp = properties_list; temp; temp = temp->next) {
                 property = temp->data;
-                if (!g_strcasecmp (property_name, property->property_name) &&
+                if (!g_ascii_strcasecmp (property_name, property->property_name) &&
                         property->property_type == PROPERTY_TYPE_STRING) {
                            description = g_strdup_printf (
 				"%s", property->property_value.value_string);
                 }
         }
 
-        return (description);
+        return description;
 }
 
 /*
@@ -91,7 +91,7 @@
 	name = get_string_value (property_list, e_lang);
 	if (name != NULL) {
 		/* We found a name property for this locale, return it. */
-		return (name);
+		return name;
 	}
 
 	g_free (e_lang);
@@ -104,7 +104,7 @@
 		name = g_strdup_printf ("-");
 	}
 		
-	return (name);
+	return name;
 }
 
 /*
@@ -122,7 +122,7 @@
 	description = get_string_value (property_list, e_lang);
 	if (description != NULL) {
 		/* We found a description property so return it. */
-		return (description);
+		return description;
 	}
 
 	g_free (e_lang);
@@ -134,7 +134,7 @@
 		description = g_strdup_printf ("-");
 	}
 
-	return (description);
+	return description;
 }
 
 static GList *
@@ -210,7 +210,7 @@
 	CORBA_free (server_info_list);
 	CORBA_exception_free (&ev);
 
-	return (ret);
+	return ret;
 }
 
 /**
@@ -228,10 +228,10 @@
 
 	if (num_query_matches(query) != 0) {
 		g_free (query);
-		return (TRUE);
+		return TRUE;
 	} else {
 		g_free (query);
-		return (FALSE);
+		return FALSE;
 	}
 }
 
@@ -343,7 +343,7 @@
 		prop = (BonoboComponentProperty *) temp->data;
 		
 		/* We only want repo_ids */
-		if (g_strcasecmp (prop->property_name, "repo_ids") == 0) {
+		if (g_ascii_strcasecmp (prop->property_name, "repo_ids") == 0) {
 			
 			prop_temp = prop->property_value.value_stringlist;
 			while (prop_temp != NULL) {