Patch for bugs when building



I am currently running karmic. When I git cloned and tried to build network-manager-applet (after successfully git cloning and building NetworkManager and ModemManager, as per http://projects.gnome.org/NetworkManager/developers/ ), the command 'make' hung in three locations.
Summary:
I fixed the 'FIXME's in ip4-routes-dialog.c and page-ip4.c, which both involved updating a deprecated method. In file 'polkit-gnome-action.c', I fixed the function call upon which make was hanging, which was again an issue of updating a deprecated method.
The patch files are attached.
--- page-ip4.c	2009-07-08 19:42:32.000000000 -0700
+++ page-ip4.c.new	2009-07-08 20:28:07.000000000 -0700
@@ -18,6 +18,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * (C) Copyright 2008 Red Hat, Inc.
+ *
+ * Modified by A. Bill Levy
  */
 
 #include <string.h>
@@ -414,11 +416,7 @@
 	path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
 	column = gtk_tree_view_get_column (priv->addr_list, COL_ADDRESS);
 
-	/* FIXME: using cells->data is pretty fragile but GTK apparently doesn't
-	 * have a way to get a cell renderer from a column based on path or iter
-	 * or whatever.
-	 */
-	cells = gtk_tree_view_column_get_cell_renderers (column);
+	cells = gtk_cell_layout_get_cells ( GTK_CELL_LAYOUT (column) );
 	gtk_tree_view_set_cursor_on_cell (priv->addr_list, path, column, cells->data, TRUE);
 
 	g_list_free (cells);
--- ip4-routes-dialog.c	2009-07-08 19:42:32.000000000 -0700
+++ ip4-routes-dialog.c.new	2009-07-08 20:27:47.000000000 -0700
@@ -18,6 +18,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * (C) Copyright 2008 Red Hat, Inc.
+ * 
+ * Modified by A. Bill Levy
  */
 
 #include <netinet/in.h>
@@ -209,11 +211,7 @@
 	path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
 	column = gtk_tree_view_get_column (GTK_TREE_VIEW (widget), COL_ADDRESS);
 
-	/* FIXME: using cells->data is pretty fragile but GTK apparently doesn't
-	 * have a way to get a cell renderer from a column based on path or iter
-	 * or whatever.
-	 */
-	cells = gtk_tree_view_column_get_cell_renderers (column);
+	cells = gtk_cell_layout_get_cells ( GTK_CELL_LAYOUT (column) );
 	gtk_tree_view_set_cursor_on_cell (GTK_TREE_VIEW (widget), path, column, cells->data, TRUE);
 
 	g_list_free (cells);
--- polkit-gnome-action.c	2009-07-08 19:42:32.000000000 -0700
+++ polkit-gnome-action.c.new	2009-07-08 20:28:22.000000000 -0700
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA.
  *
+ * Modified by A. Bill Levy
  **************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -810,7 +811,7 @@
                 /* this is bad so cop-out to UKNOWN */
                 pk_result = POLKIT_RESULT_UNKNOWN;
         } else {
-                pk_result = polkit_context_can_caller_do_action (action->priv->pk_g_context->pk_context, 
+                pk_result = polkit_context_is_caller_authorized (action->priv->pk_g_context->pk_context, 
                                                                  action->priv->polkit_action, 
                                                                  pk_caller);
                 if (pk_result != POLKIT_RESULT_YES) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]