pidgin.vv: 1c556d41: Hide PidginMedia and related structs.

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 1c556d414563a9a07c1facce5daa96861e7b4417
Ancestor: 7bcf9586593b0e91edcb9c2b3829537977bdb0e3
Author: maiku at soc.pidgin.im
Date: 2009-03-30T02:37:14
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/1c556d414563a9a07c1facce5daa96861e7b4417

Modified files:
        pidgin/gtkmain.c pidgin/gtkmedia.c pidgin/gtkmedia.h

ChangeLog: 

Hide PidginMedia and related structs.

-------------- next part --------------
============================================================
--- pidgin/gtkmain.c	82f79f7ee40aa1bfba38d4db869b5b57d8486183
+++ pidgin/gtkmain.c	60f68abb76d439fbf606f5129a564b424fc2c654
@@ -312,9 +312,7 @@ pidgin_ui_init(void)
 	pidgin_docklet_init();
 	pidgin_smileys_init();
 	pidgin_utils_init();
-#ifdef USE_VV
 	pidgin_medias_init();
-#endif
 }
 
 static GHashTable *ui_info = NULL;
============================================================
--- pidgin/gtkmedia.c	284c0f5a335d1afb850c64bd1c53850fdec5335a
+++ pidgin/gtkmedia.c	363a63c0bc9ce974964375bbc81cbcd76b89c1ce
@@ -40,6 +40,17 @@
 
 #include <gst/interfaces/xoverlay.h>
 
+#define PIDGIN_TYPE_MEDIA            (pidgin_media_get_type())
+#define PIDGIN_MEDIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_MEDIA, PidginMedia))
+#define PIDGIN_MEDIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PIDGIN_TYPE_MEDIA, PidginMediaClass))
+#define PIDGIN_IS_MEDIA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PIDGIN_TYPE_MEDIA))
+#define PIDGIN_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PIDGIN_TYPE_MEDIA))
+#define PIDGIN_MEDIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PIDGIN_TYPE_MEDIA, PidginMediaClass))
+
+typedef struct _PidginMedia PidginMedia;
+typedef struct _PidginMediaClass PidginMediaClass;
+typedef struct _PidginMediaPrivate PidginMediaPrivate;
+
 typedef enum
 {
 	/* Waiting for response */
@@ -52,6 +63,17 @@ typedef enum
 	PIDGIN_MEDIA_REJECTED,
 } PidginMediaState;
 
+struct _PidginMediaClass
+{
+	GtkWindowClass parent_class;
+};
+
+struct _PidginMedia
+{
+	GtkWindow parent;
+	PidginMediaPrivate *priv;
+};
+
 struct _PidginMediaPrivate
 {
 	PurpleMedia *media;
============================================================
--- pidgin/gtkmedia.h	c42ac6eec2b95d9ba70ae030b09484bc54227311
+++ pidgin/gtkmedia.h	79e92b858ff0e4ca9063ca26feb29b77195622ab
@@ -26,44 +26,10 @@
 #ifndef __GTKMEDIA_H_
 #define __GTKMEDIA_H_
 
-#ifdef USE_VV
-
-#include <gtk/gtk.h>
-#include <glib-object.h>
-
-#include "connection.h"
-
 G_BEGIN_DECLS
 
-#define PIDGIN_TYPE_MEDIA            (pidgin_media_get_type())
-#define PIDGIN_MEDIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_MEDIA, PidginMedia))
-#define PIDGIN_MEDIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PIDGIN_TYPE_MEDIA, PidginMediaClass))
-#define PIDGIN_IS_MEDIA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PIDGIN_TYPE_MEDIA))
-#define PIDGIN_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PIDGIN_TYPE_MEDIA))
-#define PIDGIN_MEDIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PIDGIN_TYPE_MEDIA, PidginMediaClass))
-
-typedef struct _PidginMedia PidginMedia;
-typedef struct _PidginMediaClass PidginMediaClass;
-typedef struct _PidginMediaPrivate PidginMediaPrivate;
-
-struct _PidginMediaClass
-{
-	GtkWindowClass parent_class;
-};
-
-struct _PidginMedia
-{
-	GtkWindow parent;
-	PidginMediaPrivate *priv;
-};
-
-GType pidgin_media_get_type(void);
-
 void pidgin_medias_init(void);
 
 G_END_DECLS
 
-#endif  /* USE_VV */
-
-
 #endif  /* __GTKMEDIA_H_ */