pidgin.vv: 47494ffc: Hide FinchMedia and related structures.

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 47494ffc011c156acf7cd99ee0b9b2a2bfdae443
Ancestor: 78355b8f31ae26ed1587e26a0c8267faf7b76ee7
Author: maiku at soc.pidgin.im
Date: 2009-03-30T02:57:51
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/47494ffc011c156acf7cd99ee0b9b2a2bfdae443

Modified files:
        finch/gntmedia.c finch/gntmedia.h finch/gntui.c

ChangeLog: 

Hide FinchMedia and related structures.

-------------- next part --------------
============================================================
--- finch/gntmedia.c	a56b8ac3a7026dac75acaeb90d50d730fa219c86
+++ finch/gntmedia.c	6890acb21ac4727f7f148903d40a1c4a0766bbfa
@@ -45,6 +45,29 @@
 
 #undef hangup
 
+#define FINCH_TYPE_MEDIA            (finch_media_get_type())
+#define FINCH_MEDIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), FINCH_TYPE_MEDIA, FinchMedia))
+#define FINCH_MEDIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), FINCH_TYPE_MEDIA, FinchMediaClass))
+#define FINCH_IS_MEDIA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), FINCH_TYPE_MEDIA))
+#define FINCH_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), FINCH_TYPE_MEDIA))
+#define FINCH_MEDIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), FINCH_TYPE_MEDIA, FinchMediaClass))
+
+typedef struct _FinchMedia FinchMedia;
+typedef struct _FinchMediaClass FinchMediaClass;
+typedef struct _FinchMediaPrivate FinchMediaPrivate;
+typedef enum _FinchMediaState FinchMediaState;
+
+struct _FinchMediaClass
+{
+	GntBoxClass parent_class;
+};
+
+struct _FinchMedia
+{
+	GntBox parent;
+	FinchMediaPrivate *priv;
+};
+
 struct _FinchMediaPrivate
 {
 	PurpleMedia *media;
@@ -435,9 +458,11 @@ static PurpleMediaElementInfo default_au
 			| PURPLE_MEDIA_ELEMENT_ONE_SINK,
 	create_default_audio_sink,	/* create */
 };
+#endif  /* USE_VV */
 
 void finch_media_manager_init(void)
 {
+#ifdef USE_VV
 	PurpleMediaManager *manager = purple_media_manager_get();
 	g_signal_connect(G_OBJECT(manager), "init-media", G_CALLBACK(finch_new_media), NULL);
 	purple_cmd_register("call", "", PURPLE_CMD_P_DEFAULT,
@@ -447,14 +472,16 @@ void finch_media_manager_init(void)
 	purple_debug_info("gntmedia", "Registering media element types\n");
 	purple_media_manager_set_active_element(manager, &default_audio_src);
 	purple_media_manager_set_active_element(manager, &default_audio_sink);
+#endif
 }
 
 void finch_media_manager_uninit(void)
 {
+#ifdef USE_VV
 	PurpleMediaManager *manager = purple_media_manager_get();
 	g_signal_handlers_disconnect_by_func(G_OBJECT(manager),
 			G_CALLBACK(finch_new_media), NULL);
+#endif
 }
 
-#endif  /* USE_VV */
 
============================================================
--- finch/gntmedia.h	223e03dd3e32762269888d304d145f268f398de5
+++ finch/gntmedia.h	0ffb4f30fc3de8be92e648c31c3d7ffac22c46ca
@@ -31,47 +31,12 @@
 #include "config.h"
 #endif
 
-#ifdef USE_VV
-
-#include <glib-object.h>
-#include "gntbox.h"
-
 G_BEGIN_DECLS
 
-#define FINCH_TYPE_MEDIA            (finch_media_get_type())
-#define FINCH_MEDIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), FINCH_TYPE_MEDIA, FinchMedia))
-#define FINCH_MEDIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), FINCH_TYPE_MEDIA, FinchMediaClass))
-#define FINCH_IS_MEDIA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), FINCH_TYPE_MEDIA))
-#define FINCH_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), FINCH_TYPE_MEDIA))
-#define FINCH_MEDIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), FINCH_TYPE_MEDIA, FinchMediaClass))
-
-typedef struct _FinchMedia FinchMedia;
-typedef struct _FinchMediaClass FinchMediaClass;
-typedef struct _FinchMediaPrivate FinchMediaPrivate;
-typedef enum _FinchMediaState FinchMediaState;
-
-struct _FinchMediaClass
-{
-	GntBoxClass parent_class;
-};
-
-struct _FinchMedia
-{
-	GntBox parent;
-	FinchMediaPrivate *priv;
-};
-
-GType finch_media_get_type(void);
-
-GntWidget *finch_media_new(PurpleMedia *media);
-
 void finch_media_manager_init(void);
-
 void finch_media_manager_uninit(void);
 
 G_END_DECLS
 
-#endif /* USE_VV */
-
 #endif /* GNT_MEDIA_H */
 
============================================================
--- finch/gntui.c	c51864a6b76d20a1041fb44f305b412ab764e5d7
+++ finch/gntui.c	bf59d08bbf4bfe3e21f0df6b9494ed35d149ba18
@@ -92,10 +92,8 @@ void gnt_ui_init()
 	finch_roomlist_init();
 	purple_roomlist_set_ui_ops(finch_roomlist_get_ui_ops());
 
-#ifdef USE_VV
 	/* Media */
 	finch_media_manager_init();
-#endif
 
 	gnt_register_action(_("Accounts"), finch_accounts_show_all);
 	gnt_register_action(_("Buddy List"), finch_blist_show);