diff options
| -rw-r--r-- | mixer/ChangeLog | 7 | ||||
| -rw-r--r-- | mixer/applet.c | 5 | ||||
| -rw-r--r-- | mixer/preferences.c | 15 |
3 files changed, 15 insertions, 12 deletions
diff --git a/mixer/ChangeLog b/mixer/ChangeLog index dd995156b..33b00d718 100644 --- a/mixer/ChangeLog +++ b/mixer/ChangeLog @@ -1,3 +1,10 @@ +2005-04-03 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * applet.c: (gnome_volume_applet_setup): + Some include fixes. + * preferences.c: (gnome_volume_applet_preferences_init): + Fix type-ahead bug (#171367). + 2005-03-29 Ryan Lortie <desrt@desrt.ca> * applet.c: Use show/hide_all instead of show/hide for the diff --git a/mixer/applet.c b/mixer/applet.c index 037cb4955..cd1ef9d47 100644 --- a/mixer/applet.c +++ b/mixer/applet.c @@ -29,8 +29,10 @@ #include <glib-object.h> #include <gdk/gdkkeysyms.h> +#include <gtk/gtkaboutdialog.h> #include <gtk/gtkbutton.h> #include <gtk/gtkicontheme.h> +#include <gtk/gtkmain.h> #include <gtk/gtkmessagedialog.h> #include <gtk/gtkrange.h> #include <gtk/gtktooltips.h> @@ -38,7 +40,7 @@ #include <gconf/gconf-client.h> -#include <libgnome/gnome-help.h> +#include <libgnomeui/gnome-help.h> #include "applet.h" #include "keys.h" @@ -359,7 +361,6 @@ gboolean gnome_volume_applet_setup (GnomeVolumeApplet *applet, GList *elements) { - GConfValue *value; GtkObject *adj; gint page; BonoboUIComponent *component; diff --git a/mixer/preferences.c b/mixer/preferences.c index 5e453af06..88faa5183 100644 --- a/mixer/preferences.c +++ b/mixer/preferences.c @@ -111,8 +111,7 @@ gnome_volume_applet_preferences_class_init (GnomeVolumeAppletPreferencesClass *k static void gnome_volume_applet_preferences_init (GnomeVolumeAppletPreferences *prefs) { - GtkWidget *box, *label, *view, *viewport; - GtkAdjustment *hadjustment, *vadjustment; + GtkWidget *box, *label, *view; GtkListStore *store; GtkTreeSelection *sel; GtkTreeViewColumn *col; @@ -156,19 +155,14 @@ gnome_volume_applet_preferences_init (GnomeVolumeAppletPreferences *prefs) view = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), + GTK_SHADOW_IN); gtk_widget_set_size_request (view, -1, 100); - hadjustment = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (view)); - vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (view)); - viewport = gtk_viewport_new (hadjustment, vadjustment); - gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_IN); - - gtk_container_add (GTK_CONTAINER (viewport), prefs->treeview); - gtk_container_add (GTK_CONTAINER (view), viewport); + gtk_container_add (GTK_CONTAINER (view), prefs->treeview); gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE, 0); gtk_widget_show (prefs->treeview); - gtk_widget_show (viewport); gtk_widget_show (view); /* treeview internals */ @@ -182,6 +176,7 @@ gnome_volume_applet_preferences_init (GnomeVolumeAppletPreferences *prefs) NULL); gtk_tree_view_column_set_clickable (col, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (prefs->treeview), col); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (prefs->treeview), COL_LABEL); /* and show */ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs)->vbox), box, |