From 0493b4a30bc60e0b282cdae95cdc35d8bcbac481 Mon Sep 17 00:00:00 2001 From: jtellier Date: Tue, 12 May 2009 12:13:19 -0400 Subject: Fixed some coding style. - empathy-call-window-fullscreen.c and .h now has no line > 80 caracters. - The return type and the signature in the declaration of empathy_call_window_fullscreen_new and of empathy_call_window_new are on the same line. - Removed a trailing space and a tab (which was replaced by spaces). --- src/empathy-call-window-fullscreen.c | 50 ++++++++++++++++++++++++------------ src/empathy-call-window-fullscreen.h | 16 +++++++----- src/empathy-call-window.c | 6 ++--- src/empathy-call-window.h | 3 +-- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c index 888b1dfde..33f4085b3 100644 --- a/src/empathy-call-window-fullscreen.c +++ b/src/empathy-call-window-fullscreen.c @@ -29,13 +29,16 @@ #include #include -/* The number of seconds for which the "leave fullscreen" popup should be shown */ +/* The number of seconds for which the "leave fullscreen" popup should + be shown */ #define FULLSCREEN_POPUP_TIMEOUT 5 -G_DEFINE_TYPE (EmpathyCallWindowFullscreen, empathy_call_window_fullscreen, G_TYPE_OBJECT) +G_DEFINE_TYPE (EmpathyCallWindowFullscreen, empathy_call_window_fullscreen, + G_TYPE_OBJECT) /* private structure */ -typedef struct _EmpathyCallWindowFullscreenPriv EmpathyCallWindowFullscreenPriv; +typedef struct _EmpathyCallWindowFullscreenPriv + EmpathyCallWindowFullscreenPriv; struct _EmpathyCallWindowFullscreenPriv { @@ -56,22 +59,28 @@ struct _EmpathyCallWindowFullscreenPriv static void empathy_call_window_fullscreen_dispose (GObject *object); static void empathy_call_window_fullscreen_finalize (GObject *object); -static gboolean empathy_call_window_fullscreen_hide_popup (EmpathyCallWindowFullscreen *fs); +static gboolean empathy_call_window_fullscreen_hide_popup ( + EmpathyCallWindowFullscreen *fs); static void -empathy_call_window_fullscreen_set_cursor_visible (EmpathyCallWindowFullscreen *fs, +empathy_call_window_fullscreen_set_cursor_visible ( + EmpathyCallWindowFullscreen *fs, gboolean show_cursor) { EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (fs); if (priv->video_widget != NULL && !show_cursor) - gdk_window_set_cursor (priv->video_widget->window, gdk_cursor_new (GDK_BLANK_CURSOR)); + { + gdk_window_set_cursor (priv->video_widget->window, + gdk_cursor_new (GDK_BLANK_CURSOR)); + } else gdk_window_set_cursor (priv->video_widget->window, NULL); } static void -empathy_call_window_fullscreen_add_popup_timeout (EmpathyCallWindowFullscreen *self) +empathy_call_window_fullscreen_add_popup_timeout ( + EmpathyCallWindowFullscreen *self) { EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (self); @@ -83,7 +92,8 @@ empathy_call_window_fullscreen_add_popup_timeout (EmpathyCallWindowFullscreen *s } static void -empathy_call_window_fullscreen_remove_popup_timeout (EmpathyCallWindowFullscreen *self) +empathy_call_window_fullscreen_remove_popup_timeout ( + EmpathyCallWindowFullscreen *self) { EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (self); @@ -119,7 +129,8 @@ empathy_call_window_fullscreen_show_popup (EmpathyCallWindowFullscreen *self) /* Obtaining the screen rectangle */ screen = gtk_window_get_screen (GTK_WINDOW (priv->parent_window)); gdk_screen_get_monitor_geometry (screen, - gdk_screen_get_monitor_at_window (screen, GTK_WIDGET (priv->parent_window)->window), + gdk_screen_get_monitor_at_window (screen, + GTK_WIDGET (priv->parent_window)->window), &fullscreen_rect); /* Getting the popup window sizes */ @@ -128,7 +139,8 @@ empathy_call_window_fullscreen_show_popup (EmpathyCallWindowFullscreen *self) /* Moving the popup to the top-right corner (if the direction is LTR) or the top-left corner (if the direction is RTL).*/ - if (gtk_widget_get_direction (priv->leave_fullscreen_popup) == GTK_TEXT_DIR_LTR) + if (gtk_widget_get_direction (priv->leave_fullscreen_popup) + == GTK_TEXT_DIR_LTR) { gtk_window_move (GTK_WINDOW (priv->leave_fullscreen_popup), fullscreen_rect.width + fullscreen_rect.x - leave_fullscreen_width, @@ -137,8 +149,8 @@ empathy_call_window_fullscreen_show_popup (EmpathyCallWindowFullscreen *self) } else { - gtk_window_move (GTK_WINDOW (priv->leave_fullscreen_popup), fullscreen_rect.x, - fullscreen_rect.y); + gtk_window_move (GTK_WINDOW (priv->leave_fullscreen_popup), + fullscreen_rect.x, fullscreen_rect.y); } gtk_widget_show_all (priv->leave_fullscreen_popup); @@ -183,7 +195,8 @@ empathy_call_window_fullscreen_init (EmpathyCallWindowFullscreen *self) } static void -empathy_call_window_fullscreen_class_init (EmpathyCallWindowFullscreenClass *klass) +empathy_call_window_fullscreen_class_init ( + EmpathyCallWindowFullscreenClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -209,7 +222,10 @@ empathy_call_window_fullscreen_dispose (GObject *object) priv->leave_fullscreen_popup = NULL; if (G_OBJECT_CLASS (empathy_call_window_fullscreen_parent_class)->dispose) - G_OBJECT_CLASS (empathy_call_window_fullscreen_parent_class)->dispose (object); + { + G_OBJECT_CLASS ( + empathy_call_window_fullscreen_parent_class)->dispose (object); + } } void @@ -219,7 +235,8 @@ empathy_call_window_fullscreen_finalize (GObject *object) empathy_call_window_fullscreen_remove_popup_timeout (self); - G_OBJECT_CLASS (empathy_call_window_fullscreen_parent_class)->finalize (object); + G_OBJECT_CLASS ( + empathy_call_window_fullscreen_parent_class)->finalize (object); } static void @@ -268,7 +285,8 @@ empathy_call_window_fullscreen_set_fullscreen (EmpathyCallWindowFullscreen *fs, } void -empathy_call_window_fullscreen_set_video_widget (EmpathyCallWindowFullscreen *fs, +empathy_call_window_fullscreen_set_video_widget ( + EmpathyCallWindowFullscreen *fs, GtkWidget *video_widget) { EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (fs); diff --git a/src/empathy-call-window-fullscreen.h b/src/empathy-call-window-fullscreen.h index 53dcf40e1..1ae1e98e7 100644 --- a/src/empathy-call-window-fullscreen.h +++ b/src/empathy-call-window-fullscreen.h @@ -28,7 +28,8 @@ G_BEGIN_DECLS typedef struct _EmpathyCallWindowFullscreen EmpathyCallWindowFullscreen; -typedef struct _EmpathyCallWindowFullscreenClass EmpathyCallWindowFullscreenClass; +typedef struct _EmpathyCallWindowFullscreenClass + EmpathyCallWindowFullscreenClass; struct _EmpathyCallWindowFullscreenClass { GObjectClass parent_class; @@ -59,14 +60,17 @@ GType empathy_call_window_fullscreen_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CALL_WINDOW_FULLSCREEN, \ EmpathyCallWindowFullscreenClass)) -EmpathyCallWindowFullscreen * -empathy_call_window_fullscreen_new (EmpathyCallWindow *parent); +EmpathyCallWindowFullscreen *empathy_call_window_fullscreen_new ( + EmpathyCallWindow *parent); -void empathy_call_window_fullscreen_set_fullscreen (EmpathyCallWindowFullscreen *fs, +void empathy_call_window_fullscreen_set_fullscreen ( + EmpathyCallWindowFullscreen *fs, gboolean set_fullscreen); -void empathy_call_window_fullscreen_set_video_widget (EmpathyCallWindowFullscreen *fs, +void empathy_call_window_fullscreen_set_video_widget ( + EmpathyCallWindowFullscreen *fs, GtkWidget *video_widget); -void empathy_call_window_fullscreen_show_popup (EmpathyCallWindowFullscreen *fs); +void empathy_call_window_fullscreen_show_popup ( + EmpathyCallWindowFullscreen *fs); G_END_DECLS diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index c15b5a6b5..9a9119b97 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1548,7 +1548,7 @@ empathy_call_window_video_output_motion_notify (GtkWidget *widget, empathy_call_window_fullscreen_show_popup (priv->fullscreen); return TRUE; } - + return FALSE; } @@ -1562,8 +1562,8 @@ empathy_call_window_video_menu_popup (EmpathyCallWindow *window, menu = gtk_ui_manager_get_widget (priv->ui_manager, "/video-popup"); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, - button, gtk_get_current_event_time ()); - gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE); + button, gtk_get_current_event_time ()); + gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE); } static void diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h index 26b0e7881..cda7af2f6 100644 --- a/src/empathy-call-window.h +++ b/src/empathy-call-window.h @@ -57,8 +57,7 @@ GType empathy_call_window_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CALL_WINDOW, \ EmpathyCallWindowClass)) -EmpathyCallWindow * -empathy_call_window_new (EmpathyCallHandler *handler); +EmpathyCallWindow *empathy_call_window_new (EmpathyCallHandler *handler); G_END_DECLS -- cgit v1.2.3