Author: jannis Date: 2008-06-21 15:47:44 +0000 (Sat, 21 Jun 2008) New Revision: 27112
Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c Log: Add some debugging output for Moe. Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c =================================================================== --- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c 2008-06-21 15:17:00 UTC (rev 27111) +++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c 2008-06-21 15:47:44 UTC (rev 27112) @@ -209,6 +209,8 @@ g_return_if_fail (IS_XFCE_MIXER_TRACK_COMBO (combo)); + g_message ("set_soundcard: combo->track_name = %s", combo->track_name); + if (G_LIKELY (combo->card != NULL)) g_object_unref (G_OBJECT (combo->card)); @@ -238,11 +240,18 @@ NAME_COLUMN, GST_MIXER_TRACK (titer->data)->label, TRACK_COLUMN, GST_MIXER_TRACK (titer->data), -1); + g_message ("compare %s to %s", combo->track_name, GST_MIXER_TRACK (titer->data)->label); + if (G_UNLIKELY (combo->track_name != NULL && g_utf8_collate (GST_MIXER_TRACK (titer->data)->label, combo->track_name) == 0)) - active_index = counter; + { + g_message ("equal => active_index = %i", counter); + active_index = counter; + } } } + g_message ("active_index = %i", active_index); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), active_index); } Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c =================================================================== --- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-21 15:17:00 UTC (rev 27111) +++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-21 15:47:44 UTC (rev 27112) @@ -188,6 +188,8 @@ size -= 2 + 2 * MAX (mixer_plugin->button->style->xthickness, mixer_plugin->button->style->ythickness); + g_message ("icon size = %i", size); + xfce_volume_button_set_icon_size (XFCE_VOLUME_BUTTON (mixer_plugin->button), size); xfce_volume_button_update (XFCE_VOLUME_BUTTON (mixer_plugin->button)); @@ -253,22 +255,22 @@ static void xfce_mixer_plugin_configure (XfceMixerPlugin *mixer_plugin) { - XfceMixerCard *card; - GstMixerTrack *track; + XfceMixerCard *card = NULL; + GstMixerTrack *track = NULL; GtkWidget *dialog; g_return_if_fail (mixer_plugin != NULL); xfce_panel_plugin_block_menu (mixer_plugin->plugin); + g_message ("mixer_plugin->card_name = %s, mixer_plugin->track_name = %s", mixer_plugin->card_name, mixer_plugin->track_name); + dialog = xfce_plugin_dialog_new (mixer_plugin->card_name, mixer_plugin->track_name); gtk_dialog_run (GTK_DIALOG (dialog)); xfce_plugin_dialog_get_data (XFCE_PLUGIN_DIALOG (dialog), &card, &track); - gtk_widget_destroy (dialog); - if (G_LIKELY (IS_XFCE_MIXER_CARD (card) && GST_IS_MIXER_TRACK (track))) { g_message ("Changed to card %s and track %s", xfce_mixer_card_get_display_name (card), GST_MIXER_TRACK (track)->label); @@ -280,6 +282,8 @@ xfce_mixer_plugin_update_track (mixer_plugin); } + gtk_widget_destroy (dialog); + xfce_panel_plugin_unblock_menu (mixer_plugin->plugin); } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits