shave off a number of unnecessary casts
2007-08-07 Jens Granseuer <jensgr@gmx.net> * appearance-desktop.c: (wp_add_images), (wp_dragged_image), (desktop_init): * appearance-main.c: (main): * appearance-style.c: (update_color_buttons_from_settings), (check_color_schemes_enabled), (update_cursor_size_scale), (prepare_list), (style_init): * appearance-ui.c: (ui_init): shave off a number of unnecessary casts svn path=/trunk/; revision=7975
This commit is contained in:
Jens Granseuer
Jens Granseuer
parent
25644ed991
commit
5e58d70e8f
5 changed files with 45 additions and 35 deletions
|
|
@ -1,3 +1,13 @@
|
|||
2007-08-07 Jens Granseuer <jensgr@gmx.net>
|
||||
|
||||
* appearance-desktop.c: (wp_add_images), (wp_dragged_image),
|
||||
(desktop_init):
|
||||
* appearance-main.c: (main):
|
||||
* appearance-style.c: (update_color_buttons_from_settings),
|
||||
(check_color_schemes_enabled), (update_cursor_size_scale),
|
||||
(prepare_list), (style_init):
|
||||
* appearance-ui.c: (ui_init): shave off a number of unnecessary casts
|
||||
|
||||
2007-08-07 Jens Granseuer <jensgr@gmx.net>
|
||||
|
||||
* appearance-style.c: (gtk_theme_changed): also remove code that we
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ wp_add_images (AppearanceData *data,
|
|||
GdkCursor *cursor;
|
||||
GnomeWPItem *item;
|
||||
|
||||
window = (glade_xml_get_widget (data->xml, "appearance_window"))->window;
|
||||
window = glade_xml_get_widget (data->xml, "appearance_window")->window;
|
||||
|
||||
item = NULL;
|
||||
cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
|
||||
|
|
@ -689,7 +689,7 @@ wp_dragged_image (GtkWidget *widget,
|
|||
GdkWindow *window;
|
||||
GdkCursor *cursor;
|
||||
|
||||
window = (glade_xml_get_widget (data->xml, "appearance_window"))->window;
|
||||
window = glade_xml_get_widget (data->xml, "appearance_window")->window;
|
||||
|
||||
cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
|
||||
GDK_WATCH);
|
||||
|
|
@ -969,7 +969,7 @@ desktop_init (AppearanceData *data,
|
|||
gtk_icon_view_set_model (data->wp_view, GTK_TREE_MODEL (data->wp_model));
|
||||
|
||||
g_signal_connect_after (data->wp_view, "realize",
|
||||
G_CALLBACK (wp_select_after_realize), data);
|
||||
(GCallback) wp_select_after_realize, data);
|
||||
|
||||
gtk_cell_layout_clear (GTK_CELL_LAYOUT (data->wp_view));
|
||||
|
||||
|
|
@ -991,46 +991,46 @@ desktop_init (AppearanceData *data,
|
|||
gtk_drag_dest_set (GTK_WIDGET (data->wp_view), GTK_DEST_DEFAULT_ALL, drop_types,
|
||||
G_N_ELEMENTS (drop_types), GDK_ACTION_COPY | GDK_ACTION_MOVE);
|
||||
g_signal_connect (data->wp_view, "drag_data_received",
|
||||
G_CALLBACK (wp_dragged_image), data);
|
||||
(GCallback) wp_dragged_image, data);
|
||||
|
||||
data->wp_style_menu = glade_xml_get_widget (data->xml, "wp_style_menu");
|
||||
|
||||
g_signal_connect (data->wp_style_menu, "changed",
|
||||
G_CALLBACK (wp_scale_type_changed), data);
|
||||
(GCallback) wp_scale_type_changed, data);
|
||||
|
||||
data->wp_color_menu = glade_xml_get_widget (data->xml, "wp_color_menu");
|
||||
|
||||
g_signal_connect (data->wp_color_menu, "changed",
|
||||
G_CALLBACK (wp_shade_type_changed), data);
|
||||
(GCallback) wp_shade_type_changed, data);
|
||||
|
||||
data->wp_scpicker = glade_xml_get_widget (data->xml, "wp_scpicker");
|
||||
|
||||
g_signal_connect (data->wp_scpicker, "color-set",
|
||||
G_CALLBACK (wp_scolor_changed), data);
|
||||
(GCallback) wp_scolor_changed, data);
|
||||
|
||||
data->wp_pcpicker = glade_xml_get_widget (data->xml, "wp_pcpicker");
|
||||
|
||||
g_signal_connect (data->wp_pcpicker, "color-set",
|
||||
G_CALLBACK (wp_scolor_changed), data);
|
||||
(GCallback) wp_scolor_changed, data);
|
||||
|
||||
add_button = glade_xml_get_widget (data->xml, "wp_add_button");
|
||||
gtk_button_set_image (GTK_BUTTON (add_button),
|
||||
gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_BUTTON));
|
||||
|
||||
g_signal_connect (add_button, "clicked",
|
||||
G_CALLBACK (wp_file_open_dialog), data);
|
||||
(GCallback) wp_file_open_dialog, data);
|
||||
|
||||
data->wp_rem_button = glade_xml_get_widget (data->xml, "wp_rem_button");
|
||||
|
||||
g_signal_connect (data->wp_rem_button, "clicked",
|
||||
G_CALLBACK (wp_remove_wallpaper), data);
|
||||
(GCallback) wp_remove_wallpaper, data);
|
||||
|
||||
g_idle_add (wp_load_stuffs, data);
|
||||
|
||||
g_signal_connect (data->wp_view, "selection-changed",
|
||||
G_CALLBACK (wp_props_wp_selected), data);
|
||||
(GCallback) wp_props_wp_selected, data);
|
||||
g_signal_connect (data->wp_view, "query-tooltip",
|
||||
G_CALLBACK (wp_view_tooltip_cb), data);
|
||||
(GCallback) wp_view_tooltip_cb, data);
|
||||
|
||||
wp_set_sensitivities (data);
|
||||
|
||||
|
|
@ -1071,7 +1071,7 @@ desktop_init (AppearanceData *data,
|
|||
gtk_widget_show (data->wp_image);
|
||||
|
||||
g_signal_connect (data->wp_filesel, "update-preview",
|
||||
G_CALLBACK (wp_update_preview), data);
|
||||
(GCallback) wp_update_preview, data);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -159,8 +159,8 @@ main (int argc, char **argv)
|
|||
capplet_set_icon (w, "gnome-settings-theme");
|
||||
gtk_widget_show_all (w);
|
||||
|
||||
g_signal_connect_after (G_OBJECT (w), "response",
|
||||
G_CALLBACK (main_window_response), data);
|
||||
g_signal_connect_after (w, "response",
|
||||
(GCallback) main_window_response, data);
|
||||
|
||||
/* default to background page if files were given on the command line */
|
||||
if (wallpaper_files && !install_filename && !start_page)
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ update_color_buttons_from_settings (GtkSettings *settings,
|
|||
gchar *scheme, *setting;
|
||||
|
||||
scheme = gconf_client_get_string (data->client, COLOR_SCHEME_KEY, NULL);
|
||||
g_object_get (G_OBJECT (settings), "gtk-color-scheme", &setting, NULL);
|
||||
g_object_get (settings, "gtk-color-scheme", &setting, NULL);
|
||||
|
||||
if (scheme == NULL || strcmp (scheme, "") == 0)
|
||||
gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), FALSE);
|
||||
|
|
@ -217,7 +217,7 @@ check_color_schemes_enabled (GtkSettings *settings,
|
|||
gboolean enable_colors = FALSE;
|
||||
gint i;
|
||||
|
||||
g_object_get (G_OBJECT (settings), "gtk-theme-name", &theme, NULL);
|
||||
g_object_get (settings, "gtk-theme-name", &theme, NULL);
|
||||
filename = gtkrc_find_named (theme);
|
||||
g_free (theme);
|
||||
|
||||
|
|
@ -377,7 +377,7 @@ update_cursor_size_scale (GnomeThemeCursorInfo *theme,
|
|||
GtkRange *range = GTK_RANGE (cursor_size_scale);
|
||||
|
||||
adjustment = gtk_range_get_adjustment (range);
|
||||
g_object_set (G_OBJECT (adjustment), "upper", (gdouble) theme->sizes->len - 1, NULL);
|
||||
g_object_set (adjustment, "upper", (gdouble) theme->sizes->len - 1, NULL);
|
||||
|
||||
gconf_size = gconf_client_get_int (data->client, CURSOR_SIZE_KEY, NULL);
|
||||
|
||||
|
|
@ -817,7 +817,7 @@ prepare_list (AppearanceData *data, GtkWidget *list, ThemeType type, GCallback c
|
|||
gtk_tree_view_set_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (sort_model));
|
||||
|
||||
renderer = gtk_cell_renderer_pixbuf_new ();
|
||||
g_object_set (G_OBJECT (renderer), "xpad", 3, "ypad", 3, NULL);
|
||||
g_object_set (renderer, "xpad", 3, "ypad", 3, NULL);
|
||||
|
||||
column = gtk_tree_view_column_new ();
|
||||
gtk_tree_view_column_pack_start (column, renderer, FALSE);
|
||||
|
|
@ -881,9 +881,9 @@ style_init (AppearanceData *data)
|
|||
#ifdef HAVE_XCURSOR
|
||||
w = glade_xml_get_widget (data->xml, "cursor_size_scale");
|
||||
GTK_RANGE (w)->round_digits = 0;
|
||||
g_signal_connect (G_OBJECT (w), "value-changed", (GCallback) cursor_size_scale_value_changed_cb, data);
|
||||
g_signal_connect (w, "value-changed", (GCallback) cursor_size_scale_value_changed_cb, data);
|
||||
adjustment = gtk_range_get_adjustment (GTK_RANGE (w));
|
||||
g_object_set (G_OBJECT (adjustment), "page-size", 0.0, NULL);
|
||||
g_object_set (adjustment, "page-size", 0.0, NULL);
|
||||
|
||||
w = glade_xml_get_widget (data->xml, "cursor_size_small_label");
|
||||
label = g_strdup_printf ("<small><i>%s</i></small>", gtk_label_get_text (GTK_LABEL (w)));
|
||||
|
|
@ -905,10 +905,10 @@ style_init (AppearanceData *data)
|
|||
/* connect signals */
|
||||
/* color buttons */
|
||||
for (i = 0; i < NUM_SYMBOLIC_COLORS; ++i)
|
||||
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, symbolic_names[i])), "color-set", (GCallback) color_button_clicked_cb, data);
|
||||
g_signal_connect (glade_xml_get_widget (data->xml, symbolic_names[i]), "color-set", (GCallback) color_button_clicked_cb, data);
|
||||
|
||||
/* revert button */
|
||||
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "color_scheme_defaults_button")), "clicked", (GCallback) color_scheme_defaults_button_clicked_cb, data);
|
||||
g_signal_connect (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), "clicked", (GCallback) color_scheme_defaults_button_clicked_cb, data);
|
||||
/* delete buttons */
|
||||
g_signal_connect (glade_xml_get_widget (data->xml, "gtk_themes_delete"), "clicked", (GCallback) gtk_theme_delete_cb, data);
|
||||
g_signal_connect (glade_xml_get_widget (data->xml, "window_themes_delete"), "clicked", (GCallback) window_theme_delete_cb, data);
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ show_handlebar (AppearanceData *data, gboolean show)
|
|||
static void
|
||||
set_toolbar_style (AppearanceData *data, const char *value)
|
||||
{
|
||||
static const GtkToolbarStyle gtk_toolbar_styles[] =
|
||||
static const GtkToolbarStyle gtk_toolbar_styles[] =
|
||||
{ GTK_TOOLBAR_BOTH, GTK_TOOLBAR_BOTH_HORIZ, GTK_TOOLBAR_ICONS, GTK_TOOLBAR_TEXT };
|
||||
|
||||
int enum_val;
|
||||
|
|
@ -88,9 +88,9 @@ set_have_icons (AppearanceData *data, gboolean value)
|
|||
"paste",
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
const char **name;
|
||||
|
||||
|
||||
for (name = menu_item_names; *name != NULL; name++) {
|
||||
GtkImageMenuItem *item = GTK_IMAGE_MENU_ITEM (glade_xml_get_widget (data->xml, *name));
|
||||
GtkWidget *image;
|
||||
|
|
@ -113,7 +113,7 @@ set_have_icons (AppearanceData *data, gboolean value)
|
|||
/** GConf Callbacks and Conversions **/
|
||||
|
||||
static GConfValue *
|
||||
toolbar_from_widget (GConfPropertyEditor *peditor, GConfValue *value)
|
||||
toolbar_from_widget (GConfPropertyEditor *peditor, GConfValue *value)
|
||||
{
|
||||
GConfValue *new_value;
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ toolbar_from_widget (GConfPropertyEditor *peditor, GConfValue *value)
|
|||
}
|
||||
|
||||
static GConfValue *
|
||||
toolbar_to_widget (GConfPropertyEditor *peditor, GConfValue *value)
|
||||
toolbar_to_widget (GConfPropertyEditor *peditor, GConfValue *value)
|
||||
{
|
||||
GConfValue *new_value;
|
||||
const gchar *str;
|
||||
|
|
@ -199,8 +199,8 @@ ui_init (AppearanceData *data)
|
|||
(NULL, "/desktop/gnome/interface/menus_have_icons",
|
||||
glade_xml_get_widget (data->xml, "menu_icons_toggle"), NULL);
|
||||
g_signal_connect (peditor, "value_changed",
|
||||
G_CALLBACK (menus_have_icons_cb), data);
|
||||
|
||||
(GCallback) menus_have_icons_cb, data);
|
||||
|
||||
set_have_icons (data,
|
||||
gconf_client_get_bool (data->client,
|
||||
"/desktop/gnome/interface/menus_have_icons",
|
||||
|
|
@ -212,12 +212,12 @@ ui_init (AppearanceData *data)
|
|||
"conv-to-widget-cb", toolbar_to_widget,
|
||||
"conv-from-widget-cb", toolbar_from_widget,
|
||||
NULL);
|
||||
g_signal_connect (peditor, "value_changed",
|
||||
G_CALLBACK (toolbar_style_cb), data);
|
||||
g_signal_connect (peditor, "value_changed",
|
||||
(GCallback) toolbar_style_cb, data);
|
||||
|
||||
g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "toolbar_handlebox")),
|
||||
g_signal_connect (glade_xml_get_widget (data->xml, "toolbar_handlebox"),
|
||||
"button_press_event",
|
||||
G_CALLBACK (button_press_block_cb), NULL);
|
||||
(GCallback) button_press_block_cb, NULL);
|
||||
|
||||
show_handlebar (data,
|
||||
gconf_client_get_bool (data->client,
|
||||
|
|
@ -226,7 +226,7 @@ ui_init (AppearanceData *data)
|
|||
|
||||
toolbar_style = gconf_client_get_string
|
||||
(data->client,
|
||||
"/desktop/gnome/interface/toolbar_style",
|
||||
"/desktop/gnome/interface/toolbar_style",
|
||||
NULL);
|
||||
set_toolbar_style (data, toolbar_style);
|
||||
g_free (toolbar_style);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue