[MPlayer-cvslog] r38557 - in trunk/gui: dialog/dialog.c dialog/skinbrowser.c ui/actions.c

[ib]

Author: ib
Date: Fri Jun 14 13:12:22 2024
New Revision: 38557

Log:
Handle case evSkinBrowser like all other cases.

Just show the dialog and set the layer,
and move the extra code to ShowSkinBrowser().

Modified:
   trunk/gui/dialog/dialog.c
   trunk/gui/dialog/skinbrowser.c
   trunk/gui/ui/actions.c

Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c	Fri Jun 14 13:03:45 2024	(r38556)
+++ trunk/gui/dialog/dialog.c	Fri Jun 14 13:12:22 2024	(r38557)
@@ -267,19 +267,7 @@ void gtkShow(int type, char *param)
 
     case evSkinBrowser:
         ShowSkinBrowser();
-
-//        gtk_clist_clear(GTK_CLIST(SkinList));
-        if (FillSkinList(sbSkinDirInHome) &&
-            FillSkinList(sbSkinDirInData)) {
-            gint i;
-
-            if ((i = gtkFindInCList(SkinList, param)) > -1)
-                gtk_clist_select_row(GTK_CLIST(SkinList), i, 0);
-
-            gtk_clist_sort(GTK_CLIST(SkinList));
             gtkSetLayer(SkinBrowser);
-        }
-
         break;
 
     case evPreferences:

Modified: trunk/gui/dialog/skinbrowser.c
==============================================================================
--- trunk/gui/dialog/skinbrowser.c	Fri Jun 14 13:03:45 2024	(r38556)
+++ trunk/gui/dialog/skinbrowser.c	Fri Jun 14 13:12:22 2024	(r38557)
@@ -158,6 +158,17 @@ void ShowSkinBrowser( void )
 
  prevSelected = skinName;
  gtk_widget_show(SkinBrowser);
+
+ if (FillSkinList(sbSkinDirInHome) &&
+     FillSkinList(sbSkinDirInData))
+  {
+   gint i;
+
+   if ((i = gtkFindInCList(SkinList, skinName)) > -1)
+     gtk_clist_select_row(GTK_CLIST(SkinList), i, 0);
+
+   gtk_clist_sort(GTK_CLIST(SkinList));
+  }
 }
 
 int FillSkinList( gchar * mdir )

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Fri Jun 14 13:03:45 2024	(r38556)
+++ trunk/gui/ui/actions.c	Fri Jun 14 13:12:22 2024	(r38557)
@@ -286,7 +286,7 @@ play:
         break;
 
     case evSkinBrowser:
-        gtkShow(evSkinBrowser, skinName);
+        gtkShow(evSkinBrowser, NULL);
         break;
 
     case evAbout: