debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix use of priv in GtkIconEntry code

Browse source
This commit is contained in:
Christian Dywan 2010-04-16 22:57:59 +02:00
parent 8a0a7af5ce
commit 999af1d164
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
midori/gtkiconentry.c
View file

@ -82,13 +82,13 @@ typedef struct
gboolean insensitive; gboolean insensitive;
} EntryIconInfo; } EntryIconInfo;
typedef struct _GtkIconEntryPrivate struct _GtkIconEntryPrivate
{ {
gdouble fraction; gdouble fraction;
EntryIconInfo icons[MAX_ICONS]; EntryIconInfo icons[MAX_ICONS];
gulong icon_released_id; gulong icon_released_id;
} GtkIconEntryPrivate; };
enum enum
{ {
@ -663,7 +663,7 @@ gtk_icon_entry_map (GtkWidget *widget)
GTK_WIDGET_CLASS (parent_class)->map (widget); GTK_WIDGET_CLASS (parent_class)->map (widget);
priv = widget->priv; priv = GTK_ICON_ENTRY (widget)->priv;
for (i = 0; i < MAX_ICONS; i++) for (i = 0; i < MAX_ICONS; i++)
{ {
@ -693,7 +693,7 @@ gtk_icon_entry_unmap (GtkWidget *widget)
{ {
int i; int i;
priv = widget->priv; priv = GTK_ICON_ENTRY (widget)->priv;
for (i = 0; i < MAX_ICONS; i++) for (i = 0; i < MAX_ICONS; i++)
{ {

7
midori/gtkiconentry.h
View file

@ -62,12 +62,15 @@ typedef enum
GTK_ICON_ENTRY_SECONDARY GTK_ICON_ENTRY_SECONDARY
} GtkIconEntryPosition; } GtkIconEntryPosition;
typedef struct _GtkIconEntry GtkIconEntry; typedef struct _GtkIconEntry GtkIconEntry;
typedef struct _GtkIconEntryClass GtkIconEntryClass; typedef struct _GtkIconEntryClass GtkIconEntryClass;
typedef struct _GtkIconEntryPrivate GtkIconEntryPrivate;
struct _GtkIconEntry struct _GtkIconEntry
{ {
GtkEntry parent_object; GtkEntry parent_object;
GtkIconEntryPrivate* priv;
}; };
struct _GtkIconEntryClass struct _GtkIconEntryClass