← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/rhythmbox/intrepid

« back to all changes in this revision

Viewing changes to shell/rb-shell-preferences.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-09-03 10:54:50 UTC
  • mfrom: (1.1.27 upstream)
  • Revision ID: james.westby@ubuntu.com-20080903105450-mslsln15n2ap6g7o
Tags: 0.11.6svn20080903-0ubuntu1
https://launchpad.net/bugs/263268
* New upstream snapshot:
  - doesn't crash when eject an audio player (lp: #263268)
* debian/patches/80_new_libmtp_build.patch:
  - the change is in the new version
* debian/rules:
  - don't specify a gecko variant that's not required in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/rb-shell-preferences.c
123
123
        GtkWidget *first_seen_check;
124
124
        GtkWidget *quality_check;
125
125
        GtkWidget *year_check;
 
126
        GtkWidget *location_check;
126
127
 
127
128
        GtkWidget *xfade_backend_check;
128
129
        GtkWidget *album_crossfade_check;
244
245
                glade_xml_get_widget (xml, "year_check");
245
246
        shell_preferences->priv->first_seen_check =
246
247
                glade_xml_get_widget (xml, "first_seen_check");
 
248
        shell_preferences->priv->location_check =
 
249
                glade_xml_get_widget (xml, "location_check");
247
250
 
248
251
        /* browser options */
249
252
        rb_glade_boldify_label (xml, "browser_views_label");
486
489
                colname = "RHYTHMDB_PROP_BITRATE";
487
490
        else if (butt == GTK_CHECK_BUTTON (shell_preferences->priv->first_seen_check))
488
491
                colname = "RHYTHMDB_PROP_FIRST_SEEN";
 
492
        else if (butt == GTK_CHECK_BUTTON (shell_preferences->priv->location_check))
 
493
                colname = "RHYTHMDB_PROP_LOCATION";
489
494
        else
490
495
                g_assert_not_reached ();
491
496
 
578
583
                rb_shell_preferences_sync_column_button (shell_preferences,
579
584
                                                         shell_preferences->priv->quality_check,
580
585
                                                         columns, "RHYTHMDB_PROP_BITRATE");
 
586
                rb_shell_preferences_sync_column_button (shell_preferences,
 
587
                                                         shell_preferences->priv->location_check,
 
588
                                                         columns, "RHYTHMDB_PROP_LOCATION");
581
589
        }
582
590
 
583
591
        g_free (columns);