[maemo-commits] [maemo-commits] r8946 - in projects/haf/branches/hildon-control-panel/refactoring: . src

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Jan 4 12:13:11 EET 2007 
Author: lucasr
Date: 2007-01-04 12:13:10 +0200 (Thu, 04 Jan 2007)
New Revision: 8946

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-view.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-grid.c
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
Log:
2006-01-04  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-window.c, src/hcp-app.c, src/hcp-app-list.c,
	src/hcp-grid.c, src/hcp-app-view.c: several code cleanups.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-01-04 09:45:48 UTC (rev 8945)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-01-04 10:13:10 UTC (rev 8946)
@@ -1,5 +1,10 @@
 2006-01-04  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hcp-window.c, src/hcp-app.c, src/hcp-app-list.c,
+	src/hcp-grid.c, src/hcp-app-view.c: several code cleanups.
+
+2006-01-04  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* Makefile.am, src/Makefile.am, data/Makefile.am: add *~ to
 	CLEANFILES.
 

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c	2007-01-04 09:45:48 UTC (rev 8945)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-list.c	2007-01-04 10:13:10 UTC (rev 8946)
@@ -139,7 +139,7 @@
   g_return_if_fail (al);
   g_return_if_fail (HCP_IS_APP_LIST (al));
 
-  priv = HCP_APP_LIST_GET_PRIVATE (al);
+  priv = al->priv;
 
   client = gconf_client_get_default ();
   
@@ -271,7 +271,7 @@
   g_return_if_fail (object);
   g_return_if_fail (HCP_IS_APP_LIST (object));
 
-  priv = HCP_APP_LIST_GET_PRIVATE (object);
+  priv = HCP_APP_LIST (object)->priv;
 
   if (priv->apps != NULL) 
   {
@@ -296,7 +296,7 @@
 {
   HCPAppListPrivate *priv;
 
-  priv = HCP_APP_LIST_GET_PRIVATE (gobject);
+  priv = HCP_APP_LIST (gobject)->priv;
 
   switch (prop_id)
   {
@@ -362,7 +362,7 @@
   g_return_if_fail (HCP_IS_APP_LIST (al));
   g_return_if_fail (dir_path);
 
-  priv = HCP_APP_LIST_GET_PRIVATE (al);
+  priv = al->priv;
 
   dir = g_dir_open(dir_path, 0, &error);
 
@@ -508,7 +508,7 @@
   g_return_if_fail (app);
   g_return_if_fail (HCP_IS_APP (app));
 
-  priv = HCP_APP_LIST_GET_PRIVATE (al);
+  priv = al->priv;
 
   /* Find a category for this applet */
   category_item = g_slist_find_custom (priv->categories,
@@ -548,7 +548,7 @@
   g_return_if_fail (al);
   g_return_if_fail (HCP_IS_APP_LIST (al));
 
-  priv = HCP_APP_LIST_GET_PRIVATE (al);
+  priv = al->priv;
 
   /* Clean the previous list */
   g_hash_table_foreach_remove (priv->apps, (GHRFunc) hcp_app_list_free_app, NULL);

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-view.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-view.c	2007-01-04 09:45:48 UTC (rev 8945)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app-view.c	2007-01-04 10:13:10 UTC (rev 8946)
@@ -279,7 +279,7 @@
 {
   HCPAppViewPrivate *priv;
 
-  priv = HCP_APP_VIEW_GET_PRIVATE (gobject);
+  priv = HCP_APP_VIEW (gobject)->priv;
 
   switch (prop_id)
   {
@@ -301,7 +301,7 @@
 {
   HCPAppViewPrivate *priv;
 
-  priv = HCP_APP_VIEW_GET_PRIVATE (gobject);
+  priv = HCP_APP_VIEW (gobject)->priv;
   
   switch (prop_id)
   {
@@ -369,7 +369,7 @@
   g_return_if_fail (al);
   g_return_if_fail (HCP_IS_APP_LIST (al));
 
-  priv = HCP_APP_VIEW_GET_PRIVATE (view);
+  priv = view->priv;
 
   g_object_get (G_OBJECT (al),
                 "categories", &categories,

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app.c	2007-01-04 09:45:48 UTC (rev 8945)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-app.c	2007-01-04 10:13:10 UTC (rev 8946)
@@ -101,7 +101,7 @@
   g_return_if_fail (app);
   g_return_if_fail (HCP_IS_APP (app));
 
-  priv = HCP_APP_GET_PRIVATE (app); 
+  priv = app->priv; 
 
   g_return_if_fail (priv->plugin);
 
@@ -153,7 +153,7 @@
   g_return_if_fail (HCP_IS_APP (app));
   g_return_if_fail (plugin->handle);
 
-  priv = HCP_APP_GET_PRIVATE (app); 
+  priv = app->priv; 
 
   if (dlclose (plugin->handle))
   {
@@ -175,7 +175,7 @@
   g_return_val_if_fail (d->app, FALSE);
   g_return_val_if_fail (HCP_IS_APP (d->app), FALSE);
 
-  priv = HCP_APP_GET_PRIVATE (d->app);
+  priv = d->app->priv;
   
   p = g_new0 (HCPPlugin, 1);
   
@@ -219,7 +219,7 @@
   g_return_if_fail (HCP_IS_APP (object));
 
   app = HCP_APP (object);
-  priv = HCP_APP_GET_PRIVATE (app);
+  priv = app->priv;
 
   if (priv->name != NULL) 
   {
@@ -262,7 +262,7 @@
 {
   HCPAppPrivate *priv;
 
-  priv = HCP_APP_GET_PRIVATE (gobject);
+  priv = HCP_APP (gobject)->priv;
 
   switch (prop_id)
   {
@@ -308,7 +308,7 @@
 {
   HCPAppPrivate *priv;
 
-  priv = HCP_APP_GET_PRIVATE (gobject);
+  priv = HCP_APP (gobject)->priv;
   
   switch (prop_id)
   {
@@ -463,7 +463,7 @@
   g_return_if_fail (app);
   g_return_if_fail (HCP_IS_APP (app));
 
-  priv = HCP_APP_GET_PRIVATE (app);
+  priv = app->priv;
 
   if (priv->grid) 
   {
@@ -485,7 +485,7 @@
   g_return_if_fail (app);
   g_return_if_fail (HCP_IS_APP (app));
 
-  priv = HCP_APP_GET_PRIVATE (app);
+  priv = app->priv;
 
   if (priv->save_state)
     priv->save_state (program->osso, NULL /* What is expected here? -- Jobi */);
@@ -499,7 +499,7 @@
   g_return_val_if_fail (app, FALSE);
   g_return_val_if_fail (HCP_IS_APP (app), FALSE);
 
-  priv = HCP_APP_GET_PRIVATE (app);
+  priv = app->priv;
 
   return priv->is_running;
 }
@@ -512,7 +512,7 @@
   g_return_val_if_fail (app, FALSE);
   g_return_val_if_fail (HCP_IS_APP (app), FALSE);
 
-  priv = HCP_APP_GET_PRIVATE (app);
+  priv = app->priv;
 
   return (priv->save_state == NULL);
 }

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-grid.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-grid.c	2007-01-04 09:45:48 UTC (rev 8945)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-grid.c	2007-01-04 10:13:10 UTC (rev 8946)
@@ -70,7 +70,7 @@
   g_return_val_if_fail (user_data, TRUE);
   g_return_val_if_fail (HCP_IS_GRID (user_data), TRUE);
 
-  priv = HCP_GRID_GET_PRIVATE (user_data);
+  priv = HCP_GRID (user_data)->priv;
 
   gtk_tree_model_get (GTK_TREE_MODEL (model), iter, 
                       HCP_STORE_APP, &app,
@@ -184,7 +184,7 @@
   g_return_if_fail (widget);
   g_return_if_fail (HCP_IS_GRID (widget));
 
-  priv = HCP_GRID_GET_PRIVATE (widget);
+  priv = HCP_GRID (widget)->priv;
 
   model = gtk_icon_view_get_model (GTK_ICON_VIEW (widget));
   n_items = gtk_tree_model_iter_n_children (model, NULL);
@@ -357,7 +357,7 @@
   g_return_val_if_fail (widget, FALSE);
   g_return_val_if_fail (HCP_IS_GRID (widget), FALSE);
 
-  priv = HCP_GRID_GET_PRIVATE (widget);
+  priv = HCP_GRID (widget)->priv;
 
   model = gtk_icon_view_get_model (GTK_ICON_VIEW (widget));
   n_items = gtk_tree_model_iter_n_children (model, NULL);
@@ -430,7 +430,7 @@
   g_return_if_fail (widget);
   g_return_if_fail (HCP_IS_GRID (widget));
 
-  priv = HCP_GRID_GET_PRIVATE (widget);
+  priv = HCP_GRID (widget)->priv;
 
   store = gtk_icon_view_get_model (GTK_ICON_VIEW (widget));
 
@@ -527,7 +527,7 @@
   g_return_if_fail (grid);
   g_return_if_fail (HCP_IS_GRID (grid));
 
-  priv = HCP_GRID_GET_PRIVATE (grid);
+  priv = grid->priv;
 
   priv->icon_size = icon_size;
 

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-01-04 09:45:48 UTC (rev 8945)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-window.c	2007-01-04 10:13:10 UTC (rev 8946)
@@ -100,7 +100,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   /* Actually enforce the saved state */
   if (priv->icon_size == 0)
@@ -153,7 +153,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   ret = osso_state_read (program->osso, &state);
 
@@ -250,7 +250,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   if (clear_state)
   {
@@ -335,7 +335,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   client = gconf_client_get_default ();
 
@@ -370,7 +370,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   client = gconf_client_get_default ();
 
@@ -404,7 +404,7 @@
   g_return_val_if_fail (HCP_IS_WINDOW (widget), FALSE);
 
   window = HCP_WINDOW (widget);
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   if (keyevent->type == GDK_KEY_RELEASE) 
   {
@@ -569,7 +569,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)))
     return;
@@ -598,7 +598,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   hcp_app_launch (priv->focused_item, TRUE);
 }
@@ -614,7 +614,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   if (hildon_program_get_is_topmost (program)) {
     hildon_program_set_can_hibernate (program, FALSE);
@@ -641,7 +641,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   if (priv->focused_item != NULL)
     g_object_unref (priv->focused_item);
@@ -662,7 +662,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   g_object_get (G_OBJECT (priv->focused_item),
                 "plugin", &focused,
@@ -719,7 +719,7 @@
   g_return_if_fail (window);
   g_return_if_fail (HCP_IS_WINDOW (window));
 
-  priv = HCP_WINDOW_GET_PRIVATE (window);
+  priv = window->priv;
 
   /* Why is this not read from the gtkrc?? -- Jobi */
   /* Control Panel Grid */
@@ -936,7 +936,7 @@
   g_return_if_fail (object);
   g_return_if_fail (HCP_IS_WINDOW (object));
 
-  priv = HCP_WINDOW_GET_PRIVATE (object);
+  priv = HCP_WINDOW (object)->priv;
 
   if (priv->al != NULL) 
   {
More information about the maemo-commits mailing list