Author: jannis
Date: 2008-08-31 18:33:06 +0000 (Sun, 31 Aug 2008)
New Revision: 27629

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
Log:
        * libxfce4mixe/xfce-mixer-card-combo.c,
          xfce4-mixer/xfce-mixer-window.c: Remember the selected sound card so
          that it is selected again on next startup. Use
          xfce_mixer_card_get_name() instead of
          xfce_mixer_card_get_display_name() to determine the active card
          index in XFceMixerCardCombo.


Modified: xfce4-mixer/trunk/ChangeLog
===================================================================
--- xfce4-mixer/trunk/ChangeLog 2008-08-31 13:38:18 UTC (rev 27628)
+++ xfce4-mixer/trunk/ChangeLog 2008-08-31 18:33:06 UTC (rev 27629)
@@ -1,3 +1,12 @@
+2008-08-31     Jannis Pohlmann <[EMAIL PROTECTED]>
+
+       * libxfce4mixe/xfce-mixer-card-combo.c,
+         xfce4-mixer/xfce-mixer-window.c: Remember the selected sound card so
+         that it is selected again on next startup. Use
+         xfce_mixer_card_get_name() instead of
+         xfce_mixer_card_get_display_name() to determine the active card
+         index in XFceMixerCardCombo.
+
 2008-08-10     Jannis Pohlmann <[EMAIL PROTECTED]>
 
        * panel-plugin/xfce-volume-button.c: Use mute icon only if the

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c
===================================================================
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c     2008-08-31 
13:38:18 UTC (rev 27628)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c     2008-08-31 
18:33:06 UTC (rev 27629)
@@ -218,7 +218,7 @@
       gtk_list_store_append (combo->model, &iter);
       gtk_list_store_set (combo->model, &iter, NAME_COLUMN, 
xfce_mixer_card_get_display_name (card), CARD_COLUMN, card, -1);
 
-      if (G_UNLIKELY (card_name != NULL && g_utf8_collate 
(xfce_mixer_card_get_display_name (card), card_name) == 0))
+      if (G_UNLIKELY (card_name != NULL && g_utf8_collate 
(xfce_mixer_card_get_name (card), card_name) == 0))
         active_index = counter;
     }
 

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c   2008-08-31 13:38:18 UTC 
(rev 27628)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c   2008-08-31 18:33:06 UTC 
(rev 27629)
@@ -319,6 +319,9 @@
 
   /* Make the "Select Controls..." button sensitive */
   gtk_widget_set_sensitive (window->select_controls_button, TRUE);
+
+  /* Remember the card for next time */
+  g_object_set (G_OBJECT (window->preferences), "sound-card", 
xfce_mixer_card_get_name (card), NULL);
 }
 
 

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to