totem r6248 - in trunk: . src src/plugins

[pwithnall svn gnome org]

Author: pwithnall
Date: Wed Apr  8 12:44:32 2009
New Revision: 6248
URL: http://svn.gnome.org/viewvc/totem?rev=6248&view=rev

Log:
2009-04-08  Philip Withnall  <philip tecnocode co uk>

	* src/plugins/totem-plugin-manager.c:
	* src/totem-fullscreen.c:
	* src/totem-menu.c:
	* src/totem-object.c:
	* src/totem-playlist.c:
	* src/totem-preferences.c:
	* src/totem-statusbar.c:
	* src/totem-time-label.c:
	* src/totem-video-list.c: Patch from Shixin Zeng
	<zeng shixin gmail com> to add G_MODULE_EXPORT to signal handlers
	and *_get_type functions. (Helps: #342926)



Modified:
   trunk/ChangeLog
   trunk/src/plugins/totem-plugin-manager.c
   trunk/src/totem-fullscreen.c
   trunk/src/totem-menu.c
   trunk/src/totem-object.c
   trunk/src/totem-playlist.c
   trunk/src/totem-preferences.c
   trunk/src/totem-statusbar.c
   trunk/src/totem-time-label.c
   trunk/src/totem-video-list.c

Modified: trunk/src/plugins/totem-plugin-manager.c
==============================================================================
--- trunk/src/plugins/totem-plugin-manager.c	(original)
+++ trunk/src/plugins/totem-plugin-manager.c	Wed Apr  8 12:44:32 2009
@@ -81,7 +81,7 @@
 static void plugin_manager_toggle_all (TotemPluginManager *pm);
 
 /* Callback functions for GtkBuilder */
-void configure_button_cb (GtkWidget *button, TotemPluginManager *pm);
+G_MODULE_EXPORT void configure_button_cb (GtkWidget *button, TotemPluginManager *pm);
 
 static void
 totem_plugin_manager_class_init (TotemPluginManagerClass *klass)

Modified: trunk/src/totem-fullscreen.c
==============================================================================
--- trunk/src/totem-fullscreen.c	(original)
+++ trunk/src/totem-fullscreen.c	Wed Apr  8 12:44:32 2009
@@ -44,11 +44,11 @@
 static gboolean totem_fullscreen_popup_hide (TotemFullscreen *fs);
 
 /* Callback functions for GtkBuilder */
-gboolean totem_fullscreen_vol_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
-gboolean totem_fullscreen_vol_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
-gboolean totem_fullscreen_seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
-gboolean totem_fullscreen_seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
-gboolean totem_fullscreen_motion_notify (GtkWidget *widget, GdkEventMotion *event, TotemFullscreen *fs);
+G_MODULE_EXPORT gboolean totem_fullscreen_vol_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
+G_MODULE_EXPORT gboolean totem_fullscreen_vol_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
+G_MODULE_EXPORT gboolean totem_fullscreen_seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
+G_MODULE_EXPORT gboolean totem_fullscreen_seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
+G_MODULE_EXPORT gboolean totem_fullscreen_motion_notify (GtkWidget *widget, GdkEventMotion *event, TotemFullscreen *fs);
 
 struct _TotemFullscreenPrivate {
 	BaconVideoWidget *bvw;
@@ -251,7 +251,7 @@
 	return FALSE;
 }
 
-gboolean
+G_MODULE_EXPORT gboolean
 totem_fullscreen_motion_notify (GtkWidget *widget, GdkEventMotion *event,
 				TotemFullscreen *fs)
 {

Modified: trunk/src/totem-menu.c
==============================================================================
--- trunk/src/totem-menu.c	(original)
+++ trunk/src/totem-menu.c	Wed Apr  8 12:44:32 2009
@@ -37,43 +37,43 @@
 #include "debug.h"
 
 /* Callback functions for GtkBuilder */
-void open_action_callback (GtkAction *action, Totem *totem);
-void open_location_action_callback (GtkAction *action, Totem *totem);
-void eject_action_callback (GtkAction *action, Totem *totem);
-void properties_action_callback (GtkAction *action, Totem *totem);
-void play_action_callback (GtkAction *action, Totem *totem);
-void quit_action_callback (GtkAction *action, Totem *totem);
-void preferences_action_callback (GtkAction *action, Totem *totem);
-void fullscreen_action_callback (GtkAction *action, Totem *totem);
-void zoom_1_2_action_callback (GtkAction *action, Totem *totem);
-void zoom_1_1_action_callback (GtkAction *action, Totem *totem);
-void zoom_2_1_action_callback (GtkAction *action, Totem *totem);
-void zoom_in_action_callback (GtkAction *action, Totem *totem);
-void zoom_reset_action_callback (GtkAction *action, Totem *totem);
-void zoom_out_action_callback (GtkAction *action, Totem *totem);
-void next_angle_action_callback (GtkAction *action, Totem *totem);
-void dvd_root_menu_action_callback (GtkAction *action, Totem *totem);
-void dvd_title_menu_action_callback (GtkAction *action, Totem *totem);
-void dvd_audio_menu_action_callback (GtkAction *action, Totem *totem);
-void dvd_angle_menu_action_callback (GtkAction *action, Totem *totem);
-void dvd_chapter_menu_action_callback (GtkAction *action, Totem *totem);
-void next_chapter_action_callback (GtkAction *action, Totem *totem);
-void previous_chapter_action_callback (GtkAction *action, Totem *totem);
-void skip_forward_action_callback (GtkAction *action, Totem *totem);
-void skip_backwards_action_callback (GtkAction *action, Totem *totem);
-void volume_up_action_callback (GtkAction *action, Totem *totem);
-void volume_down_action_callback (GtkAction *action, Totem *totem);
-void contents_action_callback (GtkAction *action, Totem *totem);
-void about_action_callback (GtkAction *action, Totem *totem);
-void plugins_action_callback (GtkAction *action, Totem *totem);
-void repeat_mode_action_callback (GtkToggleAction *action, Totem *totem);
-void shuffle_mode_action_callback (GtkToggleAction *action, Totem *totem);
-void deinterlace_action_callback (GtkToggleAction *action, Totem *totem);
-void show_controls_action_callback (GtkToggleAction *action, Totem *totem);
-void show_sidebar_action_callback (GtkToggleAction *action, Totem *totem);
-void aspect_ratio_changed_callback (GtkRadioAction *action, GtkRadioAction *current, Totem *totem);
-void select_subtitle_action_callback (GtkAction *action, Totem *totem);
-void clear_playlist_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void open_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void open_location_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void eject_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void properties_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void play_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void quit_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void preferences_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void fullscreen_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_1_2_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_1_1_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_2_1_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_in_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_reset_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_out_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void next_angle_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_root_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_title_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_audio_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_angle_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_chapter_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void next_chapter_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void previous_chapter_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void skip_forward_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void skip_backwards_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void volume_up_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void volume_down_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void contents_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void about_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void plugins_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void repeat_mode_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void shuffle_mode_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void deinterlace_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void show_controls_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void show_sidebar_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void aspect_ratio_changed_callback (GtkRadioAction *action, GtkRadioAction *current, Totem *totem);
+G_MODULE_EXPORT void select_subtitle_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void clear_playlist_action_callback (GtkAction *action, Totem *totem);
 
 /* Helper function to escape underscores in labels
  * before putting them in menu items */

Modified: trunk/src/totem-object.c
==============================================================================
--- trunk/src/totem-object.c	(original)
+++ trunk/src/totem-object.c	Wed Apr  8 12:44:32 2009
@@ -111,16 +111,16 @@
 static void play_pause_set_label (Totem *totem, TotemStates state);
 
 /* Callback functions for GtkBuilder */
-gboolean main_window_destroy_cb (GtkWidget *widget, GdkEvent *event, Totem *totem);
-gboolean window_state_event_cb (GtkWidget *window, GdkEventWindowState *event, Totem *totem);
-gboolean seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem);
-void seek_slider_changed_cb (GtkAdjustment *adj, Totem *totem);
-gboolean seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem);
-void volume_button_value_changed_cb (GtkScaleButton *button, gdouble value, Totem *totem);
-gboolean window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, Totem *totem);
-int window_scroll_event_cb (GtkWidget *win, GdkEventScroll *event, Totem *totem);
-void main_pane_size_allocated (GtkWidget *main_pane, GtkAllocation *allocation, Totem *totem);
-void fs_exit1_activate_cb (GtkButton *button, Totem *totem);
+G_MODULE_EXPORT gboolean main_window_destroy_cb (GtkWidget *widget, GdkEvent *event, Totem *totem);
+G_MODULE_EXPORT gboolean window_state_event_cb (GtkWidget *window, GdkEventWindowState *event, Totem *totem);
+G_MODULE_EXPORT gboolean seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem);
+G_MODULE_EXPORT void seek_slider_changed_cb (GtkAdjustment *adj, Totem *totem);
+G_MODULE_EXPORT gboolean seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem);
+G_MODULE_EXPORT void volume_button_value_changed_cb (GtkScaleButton *button, gdouble value, Totem *totem);
+G_MODULE_EXPORT gboolean window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, Totem *totem);
+G_MODULE_EXPORT int window_scroll_event_cb (GtkWidget *win, GdkEventScroll *event, Totem *totem);
+G_MODULE_EXPORT void main_pane_size_allocated (GtkWidget *main_pane, GtkAllocation *allocation, Totem *totem);
+G_MODULE_EXPORT void fs_exit1_activate_cb (GtkButton *button, Totem *totem);
 
 enum {
 	PROP_0,

Modified: trunk/src/totem-playlist.c
==============================================================================
--- trunk/src/totem-playlist.c	(original)
+++ trunk/src/totem-playlist.c	Wed Apr  8 12:44:32 2009
@@ -51,14 +51,14 @@
 					       gconstpointer data);
 
 /* Callback function for GtkBuilder */
-void totem_playlist_save_files (GtkWidget *widget, TotemPlaylist *playlist);
-void totem_playlist_add_files (GtkWidget *widget, TotemPlaylist *playlist);
-void playlist_remove_button_clicked (GtkWidget *button, TotemPlaylist *playlist);
-void totem_playlist_up_files (GtkWidget *widget, TotemPlaylist *playlist);
-void totem_playlist_down_files (GtkWidget *widget, TotemPlaylist *playlist);
-void playlist_copy_location_action_callback (GtkAction *action, TotemPlaylist *playlist);
-void playlist_select_subtitle_action_callback (GtkAction *action, TotemPlaylist *playlist);
-void playlist_remove_action_callback (GtkAction *action, TotemPlaylist *playlist);
+G_MODULE_EXPORT void totem_playlist_save_files (GtkWidget *widget, TotemPlaylist *playlist);
+G_MODULE_EXPORT void totem_playlist_add_files (GtkWidget *widget, TotemPlaylist *playlist);
+G_MODULE_EXPORT void playlist_remove_button_clicked (GtkWidget *button, TotemPlaylist *playlist);
+G_MODULE_EXPORT void totem_playlist_up_files (GtkWidget *widget, TotemPlaylist *playlist);
+G_MODULE_EXPORT void totem_playlist_down_files (GtkWidget *widget, TotemPlaylist *playlist);
+G_MODULE_EXPORT void playlist_copy_location_action_callback (GtkAction *action, TotemPlaylist *playlist);
+G_MODULE_EXPORT void playlist_select_subtitle_action_callback (GtkAction *action, TotemPlaylist *playlist);
+G_MODULE_EXPORT void playlist_remove_action_callback (GtkAction *action, TotemPlaylist *playlist);
 
 
 typedef struct {

Modified: trunk/src/totem-preferences.c
==============================================================================
--- trunk/src/totem-preferences.c	(original)
+++ trunk/src/totem-preferences.c	Wed Apr  8 12:44:32 2009
@@ -47,23 +47,23 @@
 #include "debug.h"
 
 /* Callback functions for GtkBuilder */
-void checkbutton1_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
-void checkbutton2_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
-void checkbutton3_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
-void checkbutton4_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
-void connection_combobox_changed (GtkComboBox *combobox, Totem *totem);
-void visual_menu_changed (GtkComboBox *combobox, Totem *totem);
-void visual_quality_menu_changed (GtkComboBox *combobox, Totem *totem);
-void brightness_changed (GtkRange *range, Totem *totem);
-void contrast_changed (GtkRange *range, Totem *totem);
-void saturation_changed (GtkRange *range, Totem *totem);
-void hue_changed (GtkRange *range, Totem *totem);
-void tpw_color_reset_clicked_cb (GtkButton *button, Totem *totem);
-void audio_out_menu_changed (GtkComboBox *combobox, Totem *totem);
-void font_set_cb (GtkFontButton * fb, Totem * totem);
-void encoding_set_cb (GtkComboBox *cb, Totem *totem);
-void font_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, Totem *totem);
-void encoding_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, Totem *totem);
+G_MODULE_EXPORT void checkbutton1_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
+G_MODULE_EXPORT void checkbutton2_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
+G_MODULE_EXPORT void checkbutton3_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
+G_MODULE_EXPORT void checkbutton4_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
+G_MODULE_EXPORT void connection_combobox_changed (GtkComboBox *combobox, Totem *totem);
+G_MODULE_EXPORT void visual_menu_changed (GtkComboBox *combobox, Totem *totem);
+G_MODULE_EXPORT void visual_quality_menu_changed (GtkComboBox *combobox, Totem *totem);
+G_MODULE_EXPORT void brightness_changed (GtkRange *range, Totem *totem);
+G_MODULE_EXPORT void contrast_changed (GtkRange *range, Totem *totem);
+G_MODULE_EXPORT void saturation_changed (GtkRange *range, Totem *totem);
+G_MODULE_EXPORT void hue_changed (GtkRange *range, Totem *totem);
+G_MODULE_EXPORT void tpw_color_reset_clicked_cb (GtkButton *button, Totem *totem);
+G_MODULE_EXPORT void audio_out_menu_changed (GtkComboBox *combobox, Totem *totem);
+G_MODULE_EXPORT void font_set_cb (GtkFontButton * fb, Totem * totem);
+G_MODULE_EXPORT void encoding_set_cb (GtkComboBox *cb, Totem *totem);
+G_MODULE_EXPORT void font_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, Totem *totem);
+G_MODULE_EXPORT void encoding_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, Totem *totem);
 
 static void
 totem_action_info (char *reason, Totem *totem)

Modified: trunk/src/totem-statusbar.c
==============================================================================
--- trunk/src/totem-statusbar.c	(original)
+++ trunk/src/totem-statusbar.c	Wed Apr  8 12:44:32 2009
@@ -41,6 +41,8 @@
 static void totem_statusbar_dispose          (GObject             *object);
 static void totem_statusbar_sync_description (TotemStatusbar      *statusbar);
 
+G_MODULE_EXPORT GType totem_statusbar_get_type(void);
+
 G_DEFINE_TYPE(TotemStatusbar, totem_statusbar, GTK_TYPE_STATUSBAR)
 
 static void

Modified: trunk/src/totem-time-label.c
==============================================================================
--- trunk/src/totem-time-label.c	(original)
+++ trunk/src/totem-time-label.c	Wed Apr  8 12:44:32 2009
@@ -11,6 +11,8 @@
 	gboolean seeking;
 };
 
+G_MODULE_EXPORT GType totem_time_label_get_type(void);
+
 G_DEFINE_TYPE (TotemTimeLabel, totem_time_label, GTK_TYPE_LABEL)
 #define TOTEM_TIME_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOTEM_TYPE_TIME_LABEL, TotemTimeLabelPrivate))
 

Modified: trunk/src/totem-video-list.c
==============================================================================
--- trunk/src/totem-video-list.c	(original)
+++ trunk/src/totem-video-list.c	Wed Apr  8 12:44:32 2009
@@ -83,8 +83,8 @@
 static gboolean popup_menu_cb (GtkTreeView *tree_view, TotemVideoList *video_list);
 
 /* Callback functions for GtkBuilder */
-void add_to_playlist_action_callback (GtkAction *action, TotemVideoList *self);
-void copy_location_action_callback (GtkAction *action, TotemVideoList *self);
+G_MODULE_EXPORT void add_to_playlist_action_callback (GtkAction *action, TotemVideoList *self);
+G_MODULE_EXPORT void copy_location_action_callback (GtkAction *action, TotemVideoList *self);
 
 static gint totem_video_list_table_signals[LAST_SIGNAL] = { 0 };