gtk+ r19330 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Wed Jan  9 17:02:50 2008
New Revision: 19330
URL: http://svn.gnome.org/viewvc/gtk+?rev=19330&view=rev

Log:
2008-01-09  Michael Natterer  <mitch imendio com>

	* gtk/gtkcolorsel.c (make_label_spinbutton): remove unused
	variable.

	* gtk/gtkcombobox.c (gtk_combo_box_detacher)
	* gtk/gtkicontheme.c (theme_list_contexts)
	(gtk_icon_theme_lookup_icon)
	* gtk/gtkimcontextsimple.c (beep_window)
	* gtk/gtklinkbutton.c (set_link_color)
	* gtk/gtkuimanager.c (child_hierarchy_changed_cb): add casts to
	fix warnings.

	* gtk/gtkpathbar.c (_gtk_path_bar_set_file_system): remove unused
	variable and add const to another to fix a warning.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkcolorsel.c
   trunk/gtk/gtkcombobox.c
   trunk/gtk/gtkicontheme.c
   trunk/gtk/gtkimcontextsimple.c
   trunk/gtk/gtklinkbutton.c
   trunk/gtk/gtkpathbar.c
   trunk/gtk/gtkuimanager.c

Modified: trunk/gtk/gtkcolorsel.c
==============================================================================
--- trunk/gtk/gtkcolorsel.c	(original)
+++ trunk/gtk/gtkcolorsel.c	Wed Jan  9 17:02:50 2008
@@ -1626,8 +1626,7 @@
 {
   GtkWidget *label;
   GtkAdjustment *adjust;
-  ColorSelectionPrivate *priv = colorsel->private_data;
-  
+
   if (channel_type == COLORSEL_HUE)
     {
       adjust = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 1.0, 1.0));

Modified: trunk/gtk/gtkcombobox.c
==============================================================================
--- trunk/gtk/gtkcombobox.c	(original)
+++ trunk/gtk/gtkcombobox.c	Wed Jan  9 17:02:50 2008
@@ -1312,7 +1312,7 @@
   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
   GtkComboBoxPrivate *priv = combo_box->priv;
 
-  g_return_if_fail (priv->popup_widget == menu);
+  g_return_if_fail (priv->popup_widget == (GtkWidget *) menu);
 
   g_signal_handlers_disconnect_by_func (menu->toplevel,
 					gtk_combo_box_menu_show,

Modified: trunk/gtk/gtkicontheme.c
==============================================================================
--- trunk/gtk/gtkicontheme.c	(original)
+++ trunk/gtk/gtkicontheme.c	Wed Jan  9 17:02:50 2008
@@ -1375,7 +1375,7 @@
       gchar *p;
  
       dashes = 0;
-      for (p = icon_name; *p; p++)
+      for (p = (gchar *) icon_name; *p; p++)
         if (*p == '-')
           dashes++;
 
@@ -1389,13 +1389,13 @@
         }
       names[dashes + 1] = NULL;
    
-      info = choose_icon (icon_theme, names, size, flags);
+      info = choose_icon (icon_theme, (const gchar **) names, size, flags);
       
       g_strfreev (names);
     }
   else 
     {
-      gchar *names[2];
+      const gchar *names[2];
       
       names[0] = icon_name;
       names[1] = NULL;
@@ -2282,7 +2282,7 @@
       dir = l->data;
 
       context = g_quark_to_string (dir->context);
-      g_hash_table_replace (contexts, context, NULL);
+      g_hash_table_replace (contexts, (gpointer) context, NULL);
 
       l = l->next;
     }

Modified: trunk/gtk/gtkimcontextsimple.c
==============================================================================
--- trunk/gtk/gtkimcontextsimple.c	(original)
+++ trunk/gtk/gtkimcontextsimple.c	Wed Jan  9 17:02:50 2008
@@ -1186,7 +1186,7 @@
 {
   GtkWidget *widget;
 
-  gdk_window_get_user_data (window, &widget);
+  gdk_window_get_user_data (window, (gpointer) &widget);
 
   if (GTK_IS_WIDGET (widget))
     {

Modified: trunk/gtk/gtklinkbutton.c
==============================================================================
--- trunk/gtk/gtklinkbutton.c	(original)
+++ trunk/gtk/gtklinkbutton.c	Wed Jan  9 17:02:50 2008
@@ -225,19 +225,19 @@
 
   if (link_button->priv->visited)
     {
-      gtk_widget_style_get (GTK_WIDGET (link_button), 
+      gtk_widget_style_get (GTK_WIDGET (link_button),
 			    "visited-link-color", &link_color, NULL);
       if (!link_color)
-	link_color = &default_visited_link_color;
+	link_color = (GdkColor *) &default_visited_link_color;
     }
   else
     {
-      gtk_widget_style_get (GTK_WIDGET (link_button), 
+      gtk_widget_style_get (GTK_WIDGET (link_button),
 			    "link-color", &link_color, NULL);
       if (!link_color)
-	link_color = &default_link_color;
+	link_color = (GdkColor *) &default_link_color;
     }
-  
+
   gtk_widget_modify_fg (label, GTK_STATE_NORMAL, link_color);
   gtk_widget_modify_fg (label, GTK_STATE_ACTIVE, link_color);
   gtk_widget_modify_fg (label, GTK_STATE_PRELIGHT, link_color);

Modified: trunk/gtk/gtkpathbar.c
==============================================================================
--- trunk/gtk/gtkpathbar.c	(original)
+++ trunk/gtk/gtkpathbar.c	Wed Jan  9 17:02:50 2008
@@ -1664,7 +1664,6 @@
 			       GtkFileSystem *file_system)
 {
   const char *home;
-  char *desktop;
 
   g_return_if_fail (GTK_IS_PATH_BAR (path_bar));
 
@@ -1675,7 +1674,7 @@
   home = g_get_home_dir ();
   if (home != NULL)
     {
-      gchar *freeme = NULL;
+      const gchar *desktop;
 
       path_bar->home_path = gtk_file_system_filename_to_path (path_bar->file_system, home);
       /* FIXME: Need file system backend specific way of getting the

Modified: trunk/gtk/gtkuimanager.c
==============================================================================
--- trunk/gtk/gtkuimanager.c	(original)
+++ trunk/gtk/gtkuimanager.c	Wed Jan  9 17:02:50 2008
@@ -467,7 +467,7 @@
     return;
   
   group = gtk_ui_manager_get_accel_group (uimgr);
-  groups = gtk_accel_groups_from_object (toplevel);
+  groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
   if (g_slist_find (groups, group) == NULL)
     gtk_window_add_accel_group (GTK_WINDOW (toplevel), group);