AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

remove unused variable.

Browse Source 
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.


svn path=/trunk/; revision=19330
This commit is contained in:
Michael Natterer 2008-01-09 17:02:50 +00:00 committed by Michael Natterer
parent 781d94f141
commit 9c7a2c321f
8 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
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.
2008-01-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkassistant.c (remove_page): Be more robust when removing

3
gtk/gtkcolorsel.c
View File

@ -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));

2
gtk/gtkcombobox.c
View File

@ -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,

8
gtk/gtkicontheme.c
View File

@ -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;
}

2
gtk/gtkimcontextsimple.c
View File

@ -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))
{

10
gtk/gtklinkbutton.c
View File

@ -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);

3
gtk/gtkpathbar.c
View File

@ -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

2
gtk/gtkuimanager.c
View File

@ -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);