callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fontchooser: Sanitize variable declarations

Browse Source 
- no empty lines between variables
- no unnecessary casts
- use glib-style casts
- no spaces
This commit is contained in:
Benjamin Otte 2011-09-21 00:19:51 +02:00
parent 5a5737e3b6
commit 2b83d03604
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkfontchooserwidget.c
View File

@ -363,16 +363,13 @@ static void
cursor_changed_cb (GtkTreeView *treeview, cursor_changed_cb (GtkTreeView *treeview,
gpointer user_data) gpointer user_data)
{ {
GtkFontChooserWidget *fontchooser = (GtkFontChooserWidget*)user_data; GtkFontChooserWidget *fontchooser = user_data;
GtkFontChooserWidgetPrivate *priv = fontchooser->priv; GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
PangoFontFamily *family; PangoFontFamily *family;
PangoFontFace *face; PangoFontFace *face;
PangoFontDescription *desc; PangoFontDescription *desc;
gint *sizes; gint *sizes;
gint i, n_sizes; gint i, n_sizes;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreePath *path = NULL; GtkTreePath *path = NULL;
@ -430,9 +427,8 @@ zoom_preview_cb (GtkWidget *scrolled_window,
GdkEventScroll *event, GdkEventScroll *event,
gpointer user_data) gpointer user_data)
{ {
GtkFontChooserWidget *fc = (GtkFontChooserWidget*)user_data; GtkFontChooserWidget *fc = user_data;
GtkFontChooserWidgetPrivate *priv = fc->priv; GtkFontChooserWidgetPrivate *priv = fc->priv;
GtkAdjustment *adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->size_spin)); GtkAdjustment *adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->size_spin));
if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_RIGHT) if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_RIGHT)
@ -452,8 +448,8 @@ row_inserted_cb (GtkTreeModel *model,
GtkTreeIter *iter, GtkTreeIter *iter,
gpointer user_data) gpointer user_data)
{ {
GtkFontChooserWidget *fontchooser = (GtkFontChooserWidget*)user_data; GtkFontChooserWidget *fontchooser = user_data;
GtkFontChooserWidgetPrivate *priv = fontchooser->priv; GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->list_notebook), 0); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->list_notebook), 0);
} }
@ -463,8 +459,8 @@ row_deleted_cb (GtkTreeModel *model,
GtkTreePath *path, GtkTreePath *path,
gpointer user_data) gpointer user_data)
{ {
GtkFontChooserWidget *fontchooser = (GtkFontChooserWidget*)user_data; GtkFontChooserWidget *fontchooser = user_data;
GtkFontChooserWidgetPrivate *priv = fontchooser->priv; GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
if (gtk_tree_model_iter_n_children (model, NULL) == 0) if (gtk_tree_model_iter_n_children (model, NULL) == 0)
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->list_notebook), 1); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->list_notebook), 1);
@ -473,10 +469,10 @@ row_deleted_cb (GtkTreeModel *model,
static void static void
gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser) gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser)
{ {
GIcon *icon; GIcon *icon;
GtkFontChooserWidgetPrivate *priv; GtkFontChooserWidgetPrivate *priv;
GtkWidget *scrolled_win; GtkWidget *scrolled_win;
GtkWidget *grid; GtkWidget *grid;
fontchooser->priv = G_TYPE_INSTANCE_GET_PRIVATE (fontchooser, fontchooser->priv = G_TYPE_INSTANCE_GET_PRIVATE (fontchooser,
GTK_TYPE_FONT_CHOOSER_WIDGET, GTK_TYPE_FONT_CHOOSER_WIDGET,
@ -789,8 +785,8 @@ static void
gtk_font_chooser_widget_bootstrap_fontlist (GtkFontChooserWidget *fontchooser) gtk_font_chooser_widget_bootstrap_fontlist (GtkFontChooserWidget *fontchooser)
{ {
GtkFontChooserWidgetPrivate *priv = fontchooser->priv; GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
GtkTreeView *treeview = GTK_TREE_VIEW (priv->family_face_list); GtkTreeView *treeview = GTK_TREE_VIEW (priv->family_face_list);
GtkCellRenderer *cell; GtkCellRenderer *cell;
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
priv->model = GTK_TREE_MODEL (gtk_list_store_new (4, priv->model = GTK_TREE_MODEL (gtk_list_store_new (4,
@ -1086,7 +1082,7 @@ gtk_font_chooser_widget_set_filter_func (GtkFontChooser *chooser,
gpointer data, gpointer data,
GDestroyNotify destroy) GDestroyNotify destroy)
{ {
GtkFontChooserWidget *fontchooser = GTK_FONT_CHOOSER_WIDGET (chooser); GtkFontChooserWidget *fontchooser = GTK_FONT_CHOOSER_WIDGET (chooser);
GtkFontChooserWidgetPrivate *priv = fontchooser->priv; GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
if (priv->filter_data_destroy) if (priv->filter_data_destroy)