[maemo-commits] [maemo-commits] r15911 - in projects/haf/trunk/hildon-control-panel: . debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-08-28 14:28:38 +0300 (Thu, 28 Aug 2008)
New Revision: 15911

Modified:
   projects/haf/trunk/hildon-control-panel/ChangeLog
   projects/haf/trunk/hildon-control-panel/configure.ac
   projects/haf/trunk/hildon-control-panel/debian/changelog
   projects/haf/trunk/hildon-control-panel/debian/control
   projects/haf/trunk/hildon-control-panel/src/hcp-grid.c
   projects/haf/trunk/hildon-control-panel/src/hcp-window.c
Log:
fixations


Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-control-panel/ChangeLog	2008-08-27 12:29:50 UTC (rev 15910)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog	2008-08-28 11:28:38 UTC (rev 15911)
@@ -1,3 +1,11 @@
+2008-08-28  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+	* configure.ac: release 2.2.0
+
+	* src/hcp-grid.c: Remove size_request handler hcp_grid_size_request.
+
+	* src/hcp-window.c: Include hildon/hildon-defines.h to fix building.
+
 2007-11-07  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* configure.ac: post release version bump.

Modified: projects/haf/trunk/hildon-control-panel/configure.ac
===================================================================
--- projects/haf/trunk/hildon-control-panel/configure.ac	2008-08-27 12:29:50 UTC (rev 15910)
+++ projects/haf/trunk/hildon-control-panel/configure.ac	2008-08-28 11:28:38 UTC (rev 15911)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-control-panel, 2.0.2)
+AM_INIT_AUTOMAKE(hildon-control-panel, 2.2.0)
 AM_CONFIG_HEADER(config.h)
 
 AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[Debug (default=no)])],

Modified: projects/haf/trunk/hildon-control-panel/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-control-panel/debian/changelog	2008-08-27 12:29:50 UTC (rev 15910)
+++ projects/haf/trunk/hildon-control-panel/debian/changelog	2008-08-28 11:28:38 UTC (rev 15911)
@@ -1,3 +1,11 @@
+hildon-control-panel (1:2.2.0-1~unreleased) unstable; urgency=low
+
+  * First Fremantle edition.
+  * Removed custom size_request handler hcp_grid_size_request because
+    it does not work with the current GtkIconView. Fixes: NB#87835
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 28 Aug 2008 14:06:55 +0300
+
 hildon-control-panel (1:2.0.1-1) unstable; urgency=low
 
   * src/hcp-window.c (hcp_window_app_list_updated_cb): do not try to

Modified: projects/haf/trunk/hildon-control-panel/debian/control
===================================================================
--- projects/haf/trunk/hildon-control-panel/debian/control	2008-08-27 12:29:50 UTC (rev 15910)
+++ projects/haf/trunk/hildon-control-panel/debian/control	2008-08-28 11:28:38 UTC (rev 15911)
@@ -1,7 +1,7 @@
 Source: hildon-control-panel
 Section: x11
 Priority: optional
-Maintainer: Lucas Rocha <lucas.rocha at nokia.com>
+Maintainer:  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 Build-Depends: debhelper (>= 4.0.0), libosso-gnomevfs2-dev, libhildon1-dev (>= 0.9.9), pkg-config, libosso-dev (>= 1.5), osso-af-settings, libhildonhelp-dev, maemo-launcher-dev (>= 0.22-1)
 Standards-Version: 3.6.0
 

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-grid.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-grid.c	2008-08-27 12:29:50 UTC (rev 15910)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-grid.c	2008-08-28 11:28:38 UTC (rev 15911)
@@ -1,7 +1,7 @@
 /*
  * This file is part of hildon-control-panel
  *
- * Copyright (C) 2005 Nokia Corporation.
+ * Copyright (C) 2005-2008 Nokia Corporation.
  *
  * Author: Lucas Rocha <lucas.rocha at nokia.com>
  *
@@ -432,36 +432,11 @@
 }
 
 static void
-hcp_grid_size_request (GtkWidget *widget, GtkRequisition *req)
-{
-  HCPGridPrivate *priv;
-  GtkTreeModel *store;
-  gint num_items, num_rows;
-  
-  g_return_if_fail (widget);
-  g_return_if_fail (HCP_IS_GRID (widget));
-
-  priv = HCP_GRID (widget)->priv;
-
-  store = gtk_icon_view_get_model (GTK_ICON_VIEW (widget));
-
-  num_items = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
-
-  num_rows = ceil ((double) num_items / HCP_GRID_NUM_COLUMNS);
-  
-  if (num_items > 0) 
-  {
-    req->height = num_rows * priv->row_height;
-  }
-}
-
-static void
 hcp_grid_class_init (HCPGridClass *class)
 {
   GObjectClass *g_object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
-  widget_class->size_request = hcp_grid_size_request;
   widget_class->key_release_event = hcp_grid_keyboard_listener;
   widget_class->focus_in_event = hcp_grid_focus_in;
   widget_class->button_press_event = hcp_grid_button_pressed;

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-window.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2008-08-27 12:29:50 UTC (rev 15910)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2008-08-28 11:28:38 UTC (rev 15911)
@@ -1,7 +1,7 @@
 /*
  * This file is part of hildon-control-panel
  *
- * Copyright (C) 2005 Nokia Corporation.
+ * Copyright (C) 2005-2008 Nokia Corporation.
  *
  * Author: Lucas Rocha <lucas.rocha at nokia.com>
  * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com>
@@ -30,6 +30,7 @@
 #include <hildon/hildon-help.h>
 #include <hildon/hildon-window.h>
 #include <hildon/hildon-program.h>
+#include <hildon/hildon-defines.h>
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>