[empathy] video-widget: Remove as it is now unused



commit d3e20304bf68216c268e2c7db0a2a081b8d3a197
Author: Olivier CrÃte <olivier crete collabora com>
Date:   Mon May 7 18:52:42 2012 -0400

    video-widget: Remove as it is now unused
    
    It was only used by empathy-av. Move the #defines to call-window where
    they are used.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=675647

 src/Makefile.am            |    2 -
 src/empathy-call-window.c  |   11 +-
 src/empathy-video-widget.c |  513 --------------------------------------------
 src/empathy-video-widget.h |   72 ------
 4 files changed, 6 insertions(+), 592 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 831e88c..f511b40 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,8 +101,6 @@ empathy_call_SOURCES = \
        empathy-audio-src.h \
        empathy-video-src.c \
        empathy-video-src.h \
-       empathy-video-widget.c \
-       empathy-video-widget.h \
        empathy-preferences.c \
        empathy-preferences.h \
        empathy-camera-menu.c \
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 02dcd6d..56f999d 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -61,7 +61,6 @@
 #include "empathy-call-window.h"
 #include "empathy-call-window-fullscreen.h"
 #include "empathy-call-factory.h"
-#include "empathy-video-widget.h"
 #include "empathy-about-dialog.h"
 #include "empathy-audio-src.h"
 #include "empathy-audio-sink.h"
@@ -77,6 +76,9 @@
 #define CONTENT_HBOX_SPACING 3
 #define CONTENT_HBOX_CHILDREN_PACKING_PADDING 3
 
+#define REMOTE_VIDEO_DEFAULT_WIDTH 320
+#define REMOTE_VIDEO_DEFAULT_HEIGHT 240
+
 #define SELF_VIDEO_SECTION_WIDTH 120
 #define SELF_VIDEO_SECTION_HEIGHT 90
 #define SELF_VIDEO_SECTION_MARGIN 2
@@ -87,9 +89,8 @@
 
 /* The avatar's default width and height are set to the same value because we
    want a square icon. */
-#define REMOTE_CONTACT_AVATAR_DEFAULT_WIDTH EMPATHY_VIDEO_WIDGET_DEFAULT_HEIGHT
-#define REMOTE_CONTACT_AVATAR_DEFAULT_HEIGHT \
-  EMPATHY_VIDEO_WIDGET_DEFAULT_HEIGHT
+#define REMOTE_CONTACT_AVATAR_DEFAULT_HEIGHT REMOTE_VIDEO_DEFAULT_HEIGHT
+#define REMOTE_CONTACT_AVATAR_DEFAULT_WIDTH REMOTE_VIDEO_DEFAULT_HEIGHT
 
 #define SMALL_TOOLBAR_SIZE 36
 
@@ -1655,7 +1656,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   priv->video_container = gtk_clutter_embed_new ();
 
   gtk_widget_set_size_request (priv->video_container,
-      EMPATHY_VIDEO_WIDGET_DEFAULT_WIDTH, EMPATHY_VIDEO_WIDGET_DEFAULT_HEIGHT);
+      REMOTE_VIDEO_DEFAULT_WIDTH, REMOTE_VIDEO_DEFAULT_HEIGHT);
 
   /* Set the background color to that of the rest of the window */
   context = gtk_widget_get_style_context (priv->content_hbox);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]