Mercurial > pidgin
changeset 26373:84374a764255
Hide PidginMedia and related structs.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 30 Mar 2009 02:37:14 +0000 |
| parents | d254bc6b4d60 |
| children | aa85cf759b98 0ee10b3e8ee6 |
| files | pidgin/gtkmain.c pidgin/gtkmedia.c pidgin/gtkmedia.h |
| diffstat | 3 files changed, 22 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkmain.c Mon Mar 30 01:19:02 2009 +0000 +++ b/pidgin/gtkmain.c Mon Mar 30 02:37:14 2009 +0000 @@ -312,9 +312,7 @@ pidgin_docklet_init(); pidgin_smileys_init(); pidgin_utils_init(); -#ifdef USE_VV pidgin_medias_init(); -#endif } static GHashTable *ui_info = NULL;
--- a/pidgin/gtkmedia.c Mon Mar 30 01:19:02 2009 +0000 +++ b/pidgin/gtkmedia.c Mon Mar 30 02:37:14 2009 +0000 @@ -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 @@ PIDGIN_MEDIA_REJECTED, } PidginMediaState; +struct _PidginMediaClass +{ + GtkWindowClass parent_class; +}; + +struct _PidginMedia +{ + GtkWindow parent; + PidginMediaPrivate *priv; +}; + struct _PidginMediaPrivate { PurpleMedia *media;
--- a/pidgin/gtkmedia.h Mon Mar 30 01:19:02 2009 +0000 +++ b/pidgin/gtkmedia.h Mon Mar 30 02:37:14 2009 +0000 @@ -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_ */