totem r5581 - in trunk: . browser-plugin src

[hadess svn gnome org]

Author: hadess
Date: Tue Aug 19 20:13:35 2008
New Revision: 5581
URL: http://svn.gnome.org/viewvc/totem?rev=5581&view=rev

Log:
2008-08-19  Bastien Nocera  <hadess hadess net>

	* browser-plugin/totem-plugin-viewer.c
	(totem_embedded_launch_player):
	* src/totem-statusbar.c (totem_statusbar_class_init):
	Remove code that supports older versions of GTK+



Modified:
   trunk/ChangeLog
   trunk/browser-plugin/totem-plugin-viewer.c
   trunk/src/totem-statusbar.c

Modified: trunk/browser-plugin/totem-plugin-viewer.c
==============================================================================
--- trunk/browser-plugin/totem-plugin-viewer.c	(original)
+++ trunk/browser-plugin/totem-plugin-viewer.c	Tue Aug 19 20:13:35 2008
@@ -647,17 +647,12 @@
 		uri = embedded->current_uri;
 	}
 
-#if GTK_CHECK_VERSION(2,13,0)
 	ctx = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ());
 	screen = gtk_widget_get_screen (embedded->window);
 	gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (ctx), screen);
 
 	gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (ctx), user_time);
 	gdk_app_launch_context_set_icon (GDK_APP_LAUNCH_CONTEXT (ctx), g_app_info_get_icon (embedded->app));
-#else
-	ctx = NULL;
-	screen = NULL;
-#endif
 
 	result = g_app_info_launch_uris (embedded->app, uris, ctx, NULL);
 

Modified: trunk/src/totem-statusbar.c
==============================================================================
--- trunk/src/totem-statusbar.c	(original)
+++ trunk/src/totem-statusbar.c	Tue Aug 19 20:13:35 2008
@@ -44,10 +44,6 @@
 static void totem_statusbar_init             (TotemStatusbar      *statusbar);
 static void totem_statusbar_dispose          (GObject             *object);
 static void totem_statusbar_sync_description (TotemStatusbar      *statusbar);
-#if !GTK_CHECK_VERSION (2, 11, 0)
-static void totem_statusbar_size_allocate    (GtkWidget           *widget,
-                                              GtkAllocation       *allocation);
-#endif
 
 G_DEFINE_TYPE(TotemStatusbar, totem_statusbar, GTK_TYPE_STATUSBAR)
 
@@ -55,11 +51,6 @@
 totem_statusbar_class_init (TotemStatusbarClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-#if !GTK_CHECK_VERSION (2, 11, 0)
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  widget_class->size_allocate = totem_statusbar_size_allocate;
-#endif
 
   gobject_class->dispose = totem_statusbar_dispose;
 }
@@ -315,25 +306,6 @@
   G_OBJECT_CLASS (totem_statusbar_parent_class)->dispose (object);
 }
 
-#if !GTK_CHECK_VERSION (2, 11, 0)
-static void
-totem_statusbar_size_allocate (GtkWidget *widget,
-                               GtkAllocation *allocation)
-{
-  GtkStatusbar *gstatusbar = GTK_STATUSBAR (widget);
-  GtkWidget *label, *box;
-
-  /* HACK HACK HACK ! */
-  label = gstatusbar->label;
-  box = gtk_bin_get_child (GTK_BIN (gstatusbar->frame));
-  gstatusbar->label = box;
-
-  GTK_WIDGET_CLASS (totem_statusbar_parent_class)->size_allocate (widget, allocation);
-
-  gstatusbar->label = label;
-}
-#endif /* !GTK 2.11.0 */
-
 /*
  * vim: sw=2 ts=8 cindent noai bs=2
  */