rpms/gnome-mplayer/devel gnome-mplayer-0.9.3-playlist.patch, NONE, 1.1 gnome-mplayer.spec, 1.11, 1.12

Julian Sikorski belegdol at rpmfusion.org
Thu Jan 8 19:03:27 CET 2009 

Author: belegdol

Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29156

Modified Files:
	gnome-mplayer.spec 
Added Files:
	gnome-mplayer-0.9.3-playlist.patch 
Log Message:
* Thu Jan  8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
- Added patch fixing rpmfusion bug #238 from SVN
- Made the dependencies between packages stricter (%{version} → %{version}-%{release})


gnome-mplayer-0.9.3-playlist.patch:

--- NEW FILE gnome-mplayer-0.9.3-playlist.patch ---
Index: src/playlist.c
===================================================================
--- src/playlist.c	(wersja 1092)
+++ src/playlist.c	(wersja 1093)
@@ -1008,8 +1008,8 @@
 
         gtk_paned_pack2(GTK_PANED(pane), plvbox, TRUE, TRUE);
         adjust_paned_rules();
-
-        // Style doesn't seem to have this property
+		
+		move_pane_position = TRUE;
         gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
         if (vertical_layout) {
             gtk_widget_set_size_request(plvbox, -1, 150);
Index: src/thread.c
===================================================================
--- src/thread.c	(wersja 1092)
+++ src/thread.c	(wersja 1093)
@@ -722,7 +722,7 @@
     g_idle_add(set_progress_value, idledata);
     g_idle_add(set_progress_text, idledata);
     g_idle_add(set_media_info, idledata);
-    //g_idle_add(set_window_visible, idledata);
+    g_idle_add(set_window_visible, idledata);
 
     if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
         argv[arg++] = g_strdup_printf("mplayer");
Index: src/main.c
===================================================================
--- src/main.c	(wersja 1092)
+++ src/main.c	(wersja 1093)
@@ -156,7 +156,7 @@
     GtkRecentData *recent_data;
     GtkRecentInfo *recent_info;
 #endif
-
+	
     if (gtk_list_store_iter_is_valid(playliststore, playiter)) {
         gtk_tree_model_get(GTK_TREE_MODEL(playliststore), playiter, ITEM_COLUMN, &uri,
                            DESCRIPTION_COLUMN, &title,
@@ -541,6 +541,7 @@
     disable_cover_art_fetch = FALSE;
     mixer = NULL;
     fullscreen = 0;
+	move_pane_position = FALSE;
 
     sa.sa_handler = hup_handler;
     sigemptyset(&sa.sa_mask);
Index: src/gui.c
===================================================================
--- src/gui.c	(wersja 1092)
+++ src/gui.c	(wersja 1093)
@@ -60,8 +60,8 @@
 
 void adjust_paned_rules()
 {
+	return;
     if (!idledata->videopresent) {
-
         g_object_ref(vbox);
         gtk_container_remove(GTK_CONTAINER(pane), GTK_PANED(pane)->child1);
         gtk_paned_pack1(GTK_PANED(pane), vbox, FALSE, FALSE);
@@ -81,7 +81,7 @@
 {
     gint position;
 
-    g_object_get(pane, "position", &position, NULL);
+	g_object_get(pane, "position", &position, NULL);
     g_object_ref(vbox);
     gtk_container_remove(GTK_CONTAINER(pane), vbox);
     gtk_paned_pack1(GTK_PANED(pane), vbox, TRUE, TRUE);
@@ -466,10 +466,14 @@
 
 gboolean set_window_visible(void *data)
 {
-
+	//gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem_view_playlist),FALSE);
     if (GTK_IS_WIDGET(fixed)) {
-        gtk_widget_show_all(fixed);
-    }
+		if (vertical_layout) {
+			gtk_widget_show(fixed);
+		} else {
+			gtk_widget_show(vbox);
+		}    
+	}
     return FALSE;
 }
 
@@ -794,6 +798,7 @@
     IdleData *idle = (IdleData *) data;
     gint total_height = 0;
     gint total_width = 0;
+	gint handle_size;
     GTimeVal currenttime;
 
     if (GTK_IS_WIDGET(window)) {
@@ -838,8 +843,15 @@
 
                         total_width = idle->width;
                         if (GTK_IS_WIDGET(plvbox) && GTK_WIDGET_VISIBLE(plvbox)) {
+							gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
                             total_height += plvbox->allocation.height;
-                            total_width = idle->width + plvbox->allocation.width;
+                            total_width = idle->width + plvbox->allocation.width + handle_size;
+							if (vertical_layout) {
+								gtk_paned_set_position(GTK_PANED(pane),idle->height);
+							} else {
+								gtk_paned_set_position(GTK_PANED(pane),idle->width);
+							}
+							move_pane_position = TRUE;
                         }
 
                         gtk_window_resize(GTK_WINDOW(window), total_width, total_height);
@@ -1272,6 +1284,7 @@
 
     gdouble movie_ratio, window_ratio;
     gint new_width, new_height;
+	gint handle_size;
 
 
     if (actual_x > 0 && actual_y > 0) {
@@ -1292,14 +1305,29 @@
         } else {
             if (movie_ratio > window_ratio) {
                 //printf("movie %lf > window %lf\n",movie_ratio,window_ratio);
-                new_width = allocation->width;
-                new_height = allocation->width / movie_ratio;
+				new_width = allocation->width;
+				new_height = allocation->width / movie_ratio;
             } else {
                 //printf("movie %lf < window %lf\n",movie_ratio,window_ratio);
-                new_height = allocation->height;
-                new_width = allocation->height * movie_ratio;
+				new_height = allocation->height;
+				new_width = allocation->height * movie_ratio;
             }
         }
+		
+		//printf("new_width %i new_height %i\n",new_width, new_height);
+		if (move_pane_position) {
+			if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem_view_playlist))) {
+				gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
+				if (vertical_layout) {
+						gtk_paned_set_position(GTK_PANED(pane),idledata->height);
+				} else {
+						gtk_paned_set_position(GTK_PANED(pane),idledata->width);
+				}
+			}
+			move_pane_position = FALSE;
+		}
+		printf("new_width %i new_height %i\n",new_width, new_height);
+		
         gtk_widget_set_size_request(drawing_area, new_width, new_height);
         gtk_widget_set_size_request(fixed, allocation->width, allocation->height);
         idledata->x = (allocation->width - new_width) / 2;
Index: src/common.h
===================================================================
--- src/common.h	(wersja 1092)
+++ src/common.h	(wersja 1093)
@@ -301,6 +301,7 @@
 gboolean load_tracks_from_gpod;
 gchar *gpod_mount_point;
 gboolean disable_cover_art_fetch;
+gboolean move_pane_position;
 
 gboolean remember_loc;
 gint loc_window_x;


Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-mplayer.spec	3 Jan 2009 08:56:37 -0000	1.11
+++ gnome-mplayer.spec	8 Jan 2009 18:03:27 -0000	1.12
@@ -1,12 +1,13 @@
 Name:           gnome-mplayer
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An MPlayer GUI, a full-featured binary
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://code.google.com/p/gnome-mplayer/
 Source0:        http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:         gnome-mplayer-0.9.3-playlist.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -22,9 +23,9 @@
 
 Requires:       gvfs-fuse
 Requires:       mencoder
-Requires:       %{name}-common = %{version}
+Requires:       %{name}-common = %{version}-%{release}
 
-Provides:       %{name}-binary = %{version}
+Provides:       %{name}-binary = %{version}-%{release}
 
 %description
 GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -52,8 +53,8 @@
 %package minimal
 Summary:        An MPlayer GUI, a minimal version
 Group:          Applications/Multimedia
-Requires:       %{name}-common = %{version}
-Provides:       %{name}-binary = %{version}
+Requires:       %{name}-common = %{version}-%{release}
+Provides:       %{name}-binary = %{version}-%{release}
 
 %description minimal
 GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -71,6 +72,14 @@
 tar -xzf %{SOURCE0}
 mv %{name}-%{version} minimal
 
+pushd generic
+%patch0 -p0 -b .playlist
+popd
+
+pushd minimal
+%patch0 -p0 -b .playlist
+popd
+
 
 %build
 pushd generic
@@ -161,6 +170,10 @@
 
 
 %changelog
+* Thu Jan  8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
+- Added patch fixing rpmfusion bug #238 from SVN
+- Made the dependencies between packages stricter (%%{version} → %%{version}-%%{release})
+
 * Sat Jan  3 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-1
 - Updated to 0.9.3

More information about the rpmfusion-commits mailing list