diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/widgets/ephy-spinner.c | 6 | ||||
| -rw-r--r-- | lib/widgets/testspinner.c | 3 | ||||
| -rw-r--r-- | src/ephy-link.c | 2 |
4 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2006-10-01 Christian Persch <chpe@cvs.gnome.org> + + * lib/widgets/ephy-spinner.c: (ephy_spinner_images_load), + (ephy_spinner_cache_get_images), (bump_spinner_frame_cb): + * lib/widgets/testspinner.c: (add_spinner), (main): + + Fix compile warnings. + 2006-09-29 Christian Persch <chpe@cvs.gnome.org> R embed/mozilla/AutoEventQueue.cpp: diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c index 6ce55775c..03d43b9c9 100644 --- a/lib/widgets/ephy-spinner.c +++ b/lib/widgets/ephy-spinner.c @@ -100,7 +100,7 @@ typedef struct static void ephy_spinner_cache_class_init (EphySpinnerCacheClass *klass); static void ephy_spinner_cache_init (EphySpinnerCache *cache); -static GObjectClass *ephy_spinner_cache_parent_class = NULL; +static GObjectClass *ephy_spinner_cache_parent_class; static GType ephy_spinner_cache_get_type (void) @@ -177,12 +177,12 @@ ephy_spinner_cache_data_unload (EphySpinnerCacheData *data) for (size = GTK_ICON_SIZE_INVALID; size < LAST_ICON_SIZE; ++size) { images = data->images[size]; + data->images[size] = NULL; + if (images != NULL && images != EPHY_SPINNER_IMAGES_INVALID) { ephy_spinner_images_unref (images); } - - data->images[size] = NULL; } } diff --git a/lib/widgets/testspinner.c b/lib/widgets/testspinner.c index 46eca658c..31488d55c 100644 --- a/lib/widgets/testspinner.c +++ b/lib/widgets/testspinner.c @@ -49,7 +49,7 @@ static void add_spinner (GtkTable *table, guint interval, gboolean start) { - GtkWidget *label, *frame, *spinner, *button, *spinbutton; + GtkWidget *label, *frame, *button, *spinner; char *text; text = g_strdup_printf ("%s size:", sizename); @@ -117,7 +117,6 @@ int main(int argc, char **argv) { GtkWidget *window, *vbox, *widget; GtkTable *table; - GtkTooltips *tips; int row = 0; gtk_init (&argc, &argv); diff --git a/src/ephy-link.c b/src/ephy-link.c index 623f7117a..b46201ee5 100644 --- a/src/ephy-link.c +++ b/src/ephy-link.c @@ -114,7 +114,7 @@ ephy_link_flags_from_current_event (void) {
flags = EPHY_LINK_NEW_WINDOW;
}
- else
+ else if (state == 0)
{
flags = EPHY_LINK_NEW_TAB;
}
|