GNOME.org
 

[totem] browser-plugin: White space fixes

commit 8e4eb446de679d25fd0f39e10a54f98893d1c39a
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Dec 3 20:23:18 2011 +0100

    browser-plugin: White space fixes

 browser-plugin/totem-plugin-viewer.c      |   24 ++++++++++++------------
 browser-plugin/totemConeAudio.cpp         |    2 +-
 browser-plugin/totemGMPControls.cpp       |   12 ++++++------
 browser-plugin/totemGMPError.cpp          |    2 +-
 browser-plugin/totemNPClass.h             |    2 +-
 browser-plugin/totemNPNGlue.cpp           |    2 +-
 browser-plugin/totemNPVariantWrapper.h    |    2 +-
 browser-plugin/totemNarrowSpacePlugin.cpp |    2 +-
 browser-plugin/totemPlugin.cpp            |   22 +++++++++++-----------
 browser-plugin/totemPlugin.h              |   10 +++++-----
 browser-plugin/totemPluginGlue.cpp        |    4 ++--
 11 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index d999807..860d558 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -349,7 +349,7 @@ totem_embedded_set_state (TotemEmbedded *emb, TotemStates state)
 		id = "media-playback-start-symbolic";
 		totem_statusbar_set_text (emb->statusbar, _("Stopped"));
 		totem_statusbar_set_time_and_length (emb->statusbar, 0, 0);
-		totem_time_label_set_time 
+		totem_time_label_set_time
 			(TOTEM_TIME_LABEL (emb->fs->time_label), 0, 0);
 		if (emb->href_uri != NULL && emb->hidden == FALSE) {
 			gdk_window_set_cursor
@@ -575,7 +575,7 @@ totem_embedded_set_volume (TotemEmbedded *embedded,
 
 static gboolean
 totem_embedded_launch_player (TotemEmbedded *embedded,
- 			      guint32 user_time)
+			      guint32 user_time)
 {
 	GList *uris = NULL;
 	GdkScreen *screen;
@@ -741,8 +741,8 @@ totem_embedded_set_fullscreen (TotemEmbedded *emb,
 {
 	GValue value = { 0, };
 	GtkAction *fs_action;
-	
-	fs_action = GTK_ACTION (gtk_builder_get_object 
+
+	fs_action = GTK_ACTION (gtk_builder_get_object
 				(emb->menuxml, "fullscreen1"));
 
 	if (totem_fullscreen_is_fullscreen (emb->fs) == fullscreen_enabled)
@@ -916,7 +916,7 @@ totem_embedded_open_playlist_item (TotemEmbedded *emb,
 		}
 
 		if ((eop != FALSE && emb->repeat != FALSE) || (eop == FALSE)) {
-		    	    totem_embedded_play (emb, NULL);
+			    totem_embedded_play (emb, NULL);
 		}
 	}
 
@@ -995,7 +995,7 @@ totem_embedded_set_playlist (TotemEmbedded *emb,
 	totem_embedded_clear_playlist (emb, NULL);
 
 	/* FIXME, we should remove that when we can
-	 * parse from memory or 
+	 * parse from memory or
 	 * https://bugzilla.gnome.org/show_bug.cgi?id=598702 is fixed */
 	fd = g_file_open_tmp ("totem-browser-plugin-playlist-XXXXXX",
 			      &tmp_file,
@@ -1177,7 +1177,7 @@ on_play_pause (GtkWidget *widget, TotemEmbedded *emb)
 }
 
 static void
-popup_menu_position_func (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, GtkWidget *button) 
+popup_menu_position_func (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, GtkWidget *button)
 {
 	GtkWidget *widget = GTK_WIDGET (button);
 	GtkRequisition menu_req;
@@ -1560,7 +1560,7 @@ on_tick (GtkWidget *bvw,
 					(int) (stream_length / 1000));
 		}
 
-		totem_time_label_set_time 
+		totem_time_label_set_time
 			(TOTEM_TIME_LABEL (emb->fs->time_label),
 			 current_time, stream_length);
 	}
@@ -1791,7 +1791,7 @@ totem_embedded_construct (TotemEmbedded *emb,
 	g_signal_connect (G_OBJECT (emb->fs->exit_button), "clicked",
 			  G_CALLBACK (totem_embedded_on_fullscreen_exit), emb);
 
-	emb->pp_fs_button = GTK_WIDGET (gtk_tool_button_new_from_stock 
+	emb->pp_fs_button = GTK_WIDGET (gtk_tool_button_new_from_stock
 					("media-playback-start-symbolic"));
 	g_signal_connect (G_OBJECT (emb->pp_fs_button), "clicked",
 			  G_CALLBACK (on_play_pause), emb);
@@ -1804,7 +1804,7 @@ totem_embedded_construct (TotemEmbedded *emb,
 			G_CALLBACK (totem_embedded_key_press_event), emb);
 	g_signal_connect (G_OBJECT(emb->fs_window), "key_release_event",
 			G_CALLBACK (totem_embedded_key_press_event), emb);
-	gtk_widget_add_events (GTK_WIDGET (emb->bvw), GDK_KEY_PRESS_MASK | 
+	gtk_widget_add_events (GTK_WIDGET (emb->bvw), GDK_KEY_PRESS_MASK |
 			       GDK_KEY_RELEASE_MASK);
 	g_signal_connect (G_OBJECT(emb->bvw), "key_press_event",
 			G_CALLBACK (totem_embedded_key_press_event), emb);
@@ -1869,7 +1869,7 @@ totem_embedded_construct (TotemEmbedded *emb,
 
 	emb->volume = GTK_WIDGET (gtk_builder_get_object (emb->xml, "volume_button"));
 	gtk_scale_button_set_adjustment (GTK_SCALE_BUTTON (emb->fs->volume),
-					 gtk_scale_button_get_adjustment 
+					 gtk_scale_button_get_adjustment
 					 (GTK_SCALE_BUTTON (emb->volume)));
 	gtk_button_set_focus_on_click (GTK_BUTTON (emb->volume), FALSE);
 	g_signal_connect (G_OBJECT (emb->volume), "value-changed",
@@ -2314,7 +2314,7 @@ int main (int argc, char **argv)
 	g_assert (proxy != NULL);
 
 	if (!dbus_g_proxy_call (proxy, "RequestName", &e,
-	     			G_TYPE_STRING, svcname,
+				G_TYPE_STRING, svcname,
 				G_TYPE_UINT, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
 				G_TYPE_INVALID,
 				G_TYPE_UINT, &res,
diff --git a/browser-plugin/totemConeAudio.cpp b/browser-plugin/totemConeAudio.cpp
index 604f1da..c80c3be 100644
--- a/browser-plugin/totemConeAudio.cpp
+++ b/browser-plugin/totemConeAudio.cpp
@@ -87,7 +87,7 @@ totemConeAudio::GetPropertyByIndex (int aIndex,
   switch (Properties (aIndex)) {
     case eMute:
       return BoolVariant (_result, Plugin()->IsMute());
-      
+
     case eVolume:
       return Int32Variant (_result, Plugin()->Volume() * 200.0);
 
diff --git a/browser-plugin/totemGMPControls.cpp b/browser-plugin/totemGMPControls.cpp
index 8dbcfb7..4c1ea87 100644
--- a/browser-plugin/totemGMPControls.cpp
+++ b/browser-plugin/totemGMPControls.cpp
@@ -112,12 +112,12 @@ totemGMPControls::InvokeByIndex (int aIndex,
       if (!GetNPStringFromArguments (argv, argc, 0, name))
         return false;
       if (g_ascii_strncasecmp (name.UTF8Characters, "currentItem", name.UTF8Length) == 0
-      	  || g_ascii_strncasecmp (name.UTF8Characters, "next", name.UTF8Length) == 0
-      	  || g_ascii_strncasecmp (name.UTF8Characters, "pause", name.UTF8Length) == 0
-      	  || g_ascii_strncasecmp (name.UTF8Characters, "play", name.UTF8Length) == 0
-      	  || g_ascii_strncasecmp (name.UTF8Characters, "previous", name.UTF8Length) == 0
-      	  || g_ascii_strncasecmp (name.UTF8Characters, "stop", name.UTF8Length) == 0)
-      	  return BoolVariant (_result, true);
+	  || g_ascii_strncasecmp (name.UTF8Characters, "next", name.UTF8Length) == 0
+	  || g_ascii_strncasecmp (name.UTF8Characters, "pause", name.UTF8Length) == 0
+	  || g_ascii_strncasecmp (name.UTF8Characters, "play", name.UTF8Length) == 0
+	  || g_ascii_strncasecmp (name.UTF8Characters, "previous", name.UTF8Length) == 0
+	  || g_ascii_strncasecmp (name.UTF8Characters, "stop", name.UTF8Length) == 0)
+	      return BoolVariant (_result, true);
       return BoolVariant (_result, false);
 
     case eFastForward:
diff --git a/browser-plugin/totemGMPError.cpp b/browser-plugin/totemGMPError.cpp
index 940243d..c161abc 100644
--- a/browser-plugin/totemGMPError.cpp
+++ b/browser-plugin/totemGMPError.cpp
@@ -69,7 +69,7 @@ totemGMPError::InvokeByIndex (int aIndex,
       /* void webHelp (); */
       TOTEM_WARN_INVOKE_UNIMPLEMENTED (aIndex, totemGMPError);
       return VoidVariant (_result);
-  
+
     case eItem:
       /* totemIGMPErrorItem item (in long index); */
       TOTEM_WARN_1_INVOKE_UNIMPLEMENTED (aIndex, totemGMPError);
diff --git a/browser-plugin/totemNPClass.h b/browser-plugin/totemNPClass.h
index 980baaa..ac9e030 100644
--- a/browser-plugin/totemNPClass.h
+++ b/browser-plugin/totemNPClass.h
@@ -78,7 +78,7 @@ class totemNPClass_base : public NPClass {
 
 template <class T>
 class totemNPClass : public totemNPClass_base {
-  
+
   public:
 
     typedef totemNPClass<T> class_type;
diff --git a/browser-plugin/totemNPNGlue.cpp b/browser-plugin/totemNPNGlue.cpp
index f55bd31..765bb0d 100644
--- a/browser-plugin/totemNPNGlue.cpp
+++ b/browser-plugin/totemNPNGlue.cpp
@@ -73,7 +73,7 @@ NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uin
 NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
 {
   return NPNFuncs.posturl(instance, url, window, len, buf, file);
-} 
+}
 
 NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
 {
diff --git a/browser-plugin/totemNPVariantWrapper.h b/browser-plugin/totemNPVariantWrapper.h
index 7e3ce1c..1b046e0 100644
--- a/browser-plugin/totemNPVariantWrapper.h
+++ b/browser-plugin/totemNPVariantWrapper.h
@@ -72,7 +72,7 @@ class totemNPVariantWrapper {
     operator NPObject* () { return GetObject   (); }
 
     operator NPVariant*() { return &mVariant; }
-    
+
     class GetterCopies {
       public:
        explicit GetterCopies (totemNPVariantWrapper& aTarget) : mTarget (aTarget) { }
diff --git a/browser-plugin/totemNarrowSpacePlugin.cpp b/browser-plugin/totemNarrowSpacePlugin.cpp
index a9f06ab..5bf6e0c 100644
--- a/browser-plugin/totemNarrowSpacePlugin.cpp
+++ b/browser-plugin/totemNarrowSpacePlugin.cpp
@@ -284,7 +284,7 @@ totemNarrowSpacePlayer::InvokeByIndex (int aIndex,
 
       return StringVariant (_result, "#000000");
     }
-      
+
     case eSetBgColor: {
       /* void SetBgColor (in ACString color); */
       NPString color;
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index 27db93e..dca573e 100644
--- a/browser-plugin/totemPlugin.cpp
+++ b/browser-plugin/totemPlugin.cpp
@@ -1,5 +1,5 @@
 /* Totem Mozilla plugin
- * 
+ *
  * Copyright  2004-2006 Bastien Nocera <hadess hadess net>
  * Copyright  2002 David A. Schleef <ds schleef org>
  * Copyright  2006, 2007, 2008, 2009 Christian Persch
@@ -1009,7 +1009,7 @@ totemPlugin::RequestStream (bool aForceViewer)
 	}
 #if 0
 	if (href && !requestURL) {
-	 	/* FIXME this looks wrong? any real-world testcase sites around? */
+		/* FIXME this looks wrong? any real-world testcase sites around? */
 		requestURL = href;
 	}
 #endif
@@ -1684,7 +1684,7 @@ totemPlugin::SetQtsrc (const char* aURL)
 	/* FIXME can qtsrc have URL extensions? */
 
         g_free (mQtsrcURI);
-        
+
 	/* Don't allow empty qtsrc */
 	if (!aURL || !aURL[0]) {
                 mQtsrcURI = NULL;
@@ -1709,7 +1709,7 @@ totemPlugin::SetHref (const char* aURL)
 	   aURL ? aURL : "", hasExtensions, url ? url : "", target ? target : "");
 
 #if 0
-// 	nsresult rv = NS_OK;
+//	nsresult rv = NS_OK;
 	char *baseURI;
 	if (mQtsrcURI) {
 		baseURI = mQtsrcURI;
@@ -1814,7 +1814,7 @@ totemPlugin::Init (NPMIMEType mimetype,
 	/* mode is NP_EMBED, NP_FULL, or NP_BACKGROUND (see npapi.h) */
 	/* FIXME we should error out if we are in fullscreen mode
 	 * FIXME: This might be possible on gecko trunk by returning an
- 	 * error code from the NewStream function.
+	 * error code from the NewStream function.
 	 */
 
 	NPError err;
@@ -1848,7 +1848,7 @@ totemPlugin::Init (NPMIMEType mimetype,
                 Dm ("Failed to get the document URI");
                 return NPERR_GENERIC_ERROR;
         }
-  
+
         /* FIXMEchpe: need to resolve this against any base URIs ? */
         mDocumentURI = g_strndup (docURI.GetString(), docURI.GetStringLen());
         D ("Document URI is '%s'", mDocumentURI ? mDocumentURI : "");
@@ -1858,7 +1858,7 @@ totemPlugin::Init (NPMIMEType mimetype,
 	 * for non-MOZILLA_INTERNAL_API code). nsIDOM3Node isn't frozen either,
 	 * but should be safe enough.
 	 */
-	
+
         /* This is a property on nsIDOM3Node */
         totemNPVariantWrapper baseURI;
         if (!NPN_GetProperty (mNPP,
@@ -1949,9 +1949,9 @@ totemPlugin::Init (NPMIMEType mimetype,
 	 * http://developer.mozilla.org/en/docs/Gecko_Plugin_API_Reference:Plug-in_Basics#Plug-in_Display_Modes
 	 */
 	/* FIXME: this is unnecessary, since gecko will automatically a synthetic
- 	 * "src" attribute with the "data" atttribute's content if "src" is missing,
- 	 * see http://lxr.mozilla.org/seamonkey/source/layout/generic/nsObjectFrame.cpp#2479
- 	 */
+	 * "src" attribute with the "data" atttribute's content if "src" is missing,
+	 * see http://lxr.mozilla.org/seamonkey/source/layout/generic/nsObjectFrame.cpp#2479
+	 */
 	if (!src) {
 		src = (const char *) g_hash_table_lookup (args, "data");
 	}
@@ -2485,7 +2485,7 @@ totemPlugin::StreamAsFile (NPStream *stream,
 	}
 #endif /* TOTEM_GMP_PLUGIN */
 }
-    
+
 void
 totemPlugin::URLNotify (const char *url,
 		        NPReason reason,
diff --git a/browser-plugin/totemPlugin.h b/browser-plugin/totemPlugin.h
index 8ff9de5..73ccac7 100644
--- a/browser-plugin/totemPlugin.h
+++ b/browser-plugin/totemPlugin.h
@@ -81,7 +81,7 @@ class totemPlugin {
   public:
     totemPlugin (NPP aNPP);
     ~totemPlugin ();
-  
+
     void* operator new (size_t aSize) throw ();
 
     /* plugin glue */
@@ -95,16 +95,16 @@ class totemPlugin {
                   char *argn[],
                   char *argv[],
                   NPSavedData *saved);
-  
+
     NPError SetWindow (NPWindow *aWindow);
-  
+
     NPError NewStream (NPMIMEType type,
                        NPStream* stream_ptr,
                        NPBool seekable,
                        uint16* stype);
     NPError DestroyStream (NPStream* stream,
                            NPError reason);
-  
+
     int32_t WriteReady (NPStream *stream);
     int32_t Write (NPStream *stream,
                    int32_t offset,
@@ -160,7 +160,7 @@ class totemPlugin {
     void ViewerCleanup ();
 
     void ViewerButtonPressed (guint aTimestamp,
-		    	      guint aButton);
+			      guint aButton);
 
     void ClearRequest ();
     void RequestStream (bool aForceViewer);
diff --git a/browser-plugin/totemPluginGlue.cpp b/browser-plugin/totemPluginGlue.cpp
index 1259942..efb4dd8 100644
--- a/browser-plugin/totemPluginGlue.cpp
+++ b/browser-plugin/totemPluginGlue.cpp
@@ -1,5 +1,5 @@
 /* Totem Mozilla plugin
- * 
+ *
  * Copyright  2004-2006 Bastien Nocera <hadess hadess net>
  * Copyright  2002 David A. Schleef <ds schleef org>
  * Copyright  2006, 2008 Christian Persch
@@ -449,7 +449,7 @@ NP_Initialize (NPNetscapeFuncs *aMozillaVTable,
 	aPluginVTable->print          = NewNPP_PrintProc (totem_plugin_print);
 	aPluginVTable->event          = NewNPP_HandleEventProc (totem_plugin_handle_event);
 	aPluginVTable->urlnotify      = NewNPP_URLNotifyProc (totem_plugin_url_notify);
-	aPluginVTable->javaClass      = NULL; 
+	aPluginVTable->javaClass      = NULL;
 	aPluginVTable->getvalue       = NewNPP_GetValueProc (totem_plugin_get_value);
 	aPluginVTable->setvalue       = NewNPP_SetValueProc (totem_plugin_set_value);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]