libgnomeui r5580 - in trunk: . libgnomeui

[kmaraas svn gnome org]

Author: kmaraas
Date: Mon Mar 10 15:27:20 2008
New Revision: 5580
URL: http://svn.gnome.org/viewvc/libgnomeui?rev=5580&view=rev

Log:
2008-03-10  Kjartan Maraas  <kmaraas gnome org>

	* libgnomeui/gnome-app-helper.c:
	Remove unused static function.
	* libgnomeui/gnome-dialog.c:
	Mark a function as static.
	* libgnomeui/gnome-font-picker.c:
	(gnome_font_picker_create_inside):
	Mark function as static.
	* libgnomeui/gnome-vfs-util.c:
	(gnome_gdk_pixbuf_new_from_uri_at_scale):
	NULL vs. 0.

Modified:
   trunk/ChangeLog
   trunk/libgnomeui/gnome-app-helper.c
   trunk/libgnomeui/gnome-dialog.c
   trunk/libgnomeui/gnome-font-picker.c
   trunk/libgnomeui/gnome-vfs-util.c

Modified: trunk/libgnomeui/gnome-app-helper.c
==============================================================================
--- trunk/libgnomeui/gnome-app-helper.c	(original)
+++ trunk/libgnomeui/gnome-app-helper.c	Mon Mar 10 15:27:20 2008
@@ -2463,52 +2463,6 @@
 }
 
 static void
-toolbar_style_changed_notify(GConfClient            *client,
-                             guint                   cnxn_id,
-			     GConfEntry             *entry,
-                             gpointer                user_data)
-{
-        GtkToolbarStyle style = GTK_TOOLBAR_BOTH;
-        GtkWidget *w = user_data;
-        GtkToolbar *toolbar = GTK_TOOLBAR(w);
-        gchar *per_app_key;
-        gchar *str;
-        gboolean got_it = FALSE;
-	GConfValue *value;
-
-        /* Check for app-specific override */
-        per_app_key = gnome_gconf_get_gnome_libs_settings_relative("toolbar_style");
-        str = gconf_client_get_string(client, per_app_key, NULL);
-        g_free(per_app_key);
-
-        if (str) {
-                if (gconf_string_to_enum(toolbar_styles,
-                                         str,
-                                         (gint*)&style)) {
-                        got_it = TRUE;
-                }
-                g_free(str);
-        }
-
-	value = gconf_entry_get_value (entry);
-
-        /* If no per-app setting use this new global setting */
-        if (!got_it &&
-            value &&
-            value->type == GCONF_VALUE_STRING &&
-            gconf_value_get_string(value) != NULL) {
-		if (!gconf_string_to_enum (toolbar_styles,
-					   gconf_value_get_string (value),
-					   (gint *)&style))
-			style = GTK_TOOLBAR_BOTH;
-        }
-
-	GDK_THREADS_ENTER();
-        gtk_toolbar_set_style(toolbar, style);
-	GDK_THREADS_LEAVE();
-}
-
-static void
 style_menu_item_activated (GtkWidget *item, GtkToolbarStyle style)
 {
 	GConfClient *conf;

Modified: trunk/libgnomeui/gnome-dialog.c
==============================================================================
--- trunk/libgnomeui/gnome-dialog.c	(original)
+++ trunk/libgnomeui/gnome-dialog.c	Mon Mar 10 15:27:20 2008
@@ -1070,6 +1070,7 @@
     (* (G_OBJECT_CLASS(parent_class)->finalize))(object);
 }
 
+static
 void gnome_dialog_close_real(GnomeDialog * dialog)
 {
   g_return_if_fail(dialog != NULL);

Modified: trunk/libgnomeui/gnome-font-picker.c
==============================================================================
--- trunk/libgnomeui/gnome-font-picker.c	(original)
+++ trunk/libgnomeui/gnome-font-picker.c	Mon Mar 10 15:27:20 2008
@@ -965,7 +965,8 @@
     gfp->_priv->font_dialog = NULL;
 } /* gnome_font_picker_dialog_destroy */
 
-GtkWidget *gnome_font_picker_create_inside(GnomeFontPicker *gfp)
+static GtkWidget *
+gnome_font_picker_create_inside(GnomeFontPicker *gfp)
 {
     GtkWidget *widget;
 
@@ -1017,7 +1018,7 @@
 	gtk_widget_modify_font (gfp->_priv->font_label, desc);
 
 	pango_font_description_free (desc);
-	
+
 } /* gnome_font_picker_set_label_font */
 
 static void

Modified: trunk/libgnomeui/gnome-vfs-util.c
==============================================================================
--- trunk/libgnomeui/gnome-vfs-util.c	(original)
+++ trunk/libgnomeui/gnome-vfs-util.c	Mon Mar 10 15:27:20 2008
@@ -216,7 +216,7 @@
 
 	animation = gdk_pixbuf_loader_get_animation (loader);
 	if (animation) {
-		iter = gdk_pixbuf_animation_get_iter (animation, 0);
+		iter = gdk_pixbuf_animation_get_iter (animation, NULL);
 		if (!gdk_pixbuf_animation_iter_on_currently_loading_frame (iter)) {
 			has_frame = TRUE;
 		}