From: Michael Natterer Date: Wed, 9 Jan 2008 17:02:50 +0000 (+0000) Subject: remove unused variable. X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=9c7a2c321fd5c7cea0564442cbc96812b47dd759;p=~andy%2Fgtk remove unused variable. 2008-01-09 Michael Natterer * 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. svn path=/trunk/; revision=19330 --- diff --git a/ChangeLog b/ChangeLog index 19c88b742..5ae3f3cd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-01-09 Michael Natterer + + * 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. + 2008-01-07 Matthias Clasen * gtk/gtkassistant.c (remove_page): Be more robust when removing diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 5246a21c2..29d828189 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1626,8 +1626,7 @@ make_label_spinbutton (GtkColorSelection *colorsel, { 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)); diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 7b58e80c4..3dc094f82 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1312,7 +1312,7 @@ gtk_combo_box_detacher (GtkWidget *widget, 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, diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 5175f20ce..108f1f19a 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1375,7 +1375,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme *icon_theme, gchar *p; dashes = 0; - for (p = icon_name; *p; p++) + for (p = (gchar *) icon_name; *p; p++) if (*p == '-') dashes++; @@ -1389,13 +1389,13 @@ gtk_icon_theme_lookup_icon (GtkIconTheme *icon_theme, } 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 @@ theme_list_contexts (IconTheme *theme, 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; } diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index f13bbc455..7218b2e8f 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -1186,7 +1186,7 @@ beep_window (GdkWindow *window) { GtkWidget *widget; - gdk_window_get_user_data (window, &widget); + gdk_window_get_user_data (window, (gpointer) &widget); if (GTK_IS_WIDGET (widget)) { diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 1fc0645c3..927b9b6f1 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -225,19 +225,19 @@ set_link_color (GtkLinkButton *link_button) 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); diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 6a11dc2eb..76eccae0c 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -1664,7 +1664,6 @@ _gtk_path_bar_set_file_system (GtkPathBar *path_bar, GtkFileSystem *file_system) { const char *home; - char *desktop; g_return_if_fail (GTK_IS_PATH_BAR (path_bar)); @@ -1675,7 +1674,7 @@ _gtk_path_bar_set_file_system (GtkPathBar *path_bar, 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 diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 2273579d1..8f9b073a8 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -467,7 +467,7 @@ child_hierarchy_changed_cb (GtkWidget *widget, 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);