[Rawstudio-commit] r3426 - in trunk/plugins: output-flickr output-picasa

[Klaus Post]

Author: post
Date: 2010-06-15 19:24:56 +0200 (Tue, 15 Jun 2010)
New Revision: 3426

Modified:
   trunk/plugins/output-flickr/output-flickr.c
   trunk/plugins/output-picasa/output-picasa.c
Log:
Use static function for loading logo, avoids runtime linking clash.

Modified: trunk/plugins/output-flickr/output-flickr.c
===================================================================
--- trunk/plugins/output-flickr/output-flickr.c 2010-06-14 20:45:47 UTC (rev 
3425)
+++ trunk/plugins/output-flickr/output-flickr.c 2010-06-15 17:24:56 UTC (rev 
3426)
@@ -83,7 +83,7 @@
 static void get_property (GObject * object, guint property_id, GValue * value, 
GParamSpec * pspec);
 static void set_property (GObject * object, guint property_id, const GValue * 
value, GParamSpec * pspec);
 static gboolean execute (RSOutput * output, RSFilter * filter);
-GtkWidget * get_logo_widget(RSFlickr *flickr);
+static GtkWidget * get_logo_widget(RSFlickr *flickr);
 
 G_MODULE_EXPORT void rs_plugin_load (RSPlugin * plugin)
 {
@@ -463,7 +463,7 @@
        return TRUE;
 }
 
-GtkWidget *
+static GtkWidget *
 get_logo_widget(RSFlickr *flickr)
 {
        gchar *filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE, 
"/plugins/flickr-logo.svg", NULL);

Modified: trunk/plugins/output-picasa/output-picasa.c
===================================================================
--- trunk/plugins/output-picasa/output-picasa.c 2010-06-14 20:45:47 UTC (rev 
3425)
+++ trunk/plugins/output-picasa/output-picasa.c 2010-06-15 17:24:56 UTC (rev 
3426)
@@ -75,7 +75,7 @@
 static void set_property (GObject * object, guint property_id, const GValue * 
value, GParamSpec * pspec);
 static gboolean execute (RSOutput * output, RSFilter * filter);
 GtkWidget * get_album_selector_widget(RSPicasa *picasa);
-GtkWidget * get_logo_widget(RSPicasa *picasa);
+static GtkWidget * get_picasa_logo_widget(RSPicasa *picasa);
 
 G_MODULE_EXPORT void rs_plugin_load (RSPlugin * plugin)
 {
@@ -134,7 +134,7 @@
                g_value_set_int (value, picasa->quality);
                break;
        case PROP_LOGO:
-               g_value_set_object(value, get_logo_widget(picasa));
+               g_value_set_object(value, get_picasa_logo_widget(picasa));
                break;
        case PROP_ALBUM_SELECTOR:
                g_value_set_object(value, get_album_selector_widget(picasa));
@@ -412,8 +412,8 @@
        return deal_with_error(&error);
 }
 
-GtkWidget *
-get_logo_widget(RSPicasa *picasa)
+static GtkWidget *
+get_picasa_logo_widget(RSPicasa *picasa)
 {
        gchar *filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE, 
"/plugins/picasa-logo.svg", NULL);
        GtkWidget *box = gtk_vbox_new(TRUE, 2);


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit