diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-19 20:58:53 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-19 20:58:53 +0200 |
| commit | 6ce1f73ca437f7bdfb52772ce8422ab909345850 (patch) | |
| tree | 3a541ff6022cce7aeed288e6010e801b4af44e0f /plugins/gtkui/prefwin.c | |
| parent | 86f4222cfe1e30c2de6c7362e31a8ab5b68f7321 (diff) | |
| parent | 7dedf440d149b7f7394c7810d9ca6e42ee89b7bd (diff) | |
Merge branch 'master' into i18n
Conflicts:
playlist.c
Diffstat (limited to 'plugins/gtkui/prefwin.c')
| -rw-r--r-- | plugins/gtkui/prefwin.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c index e7ae8476..f30d41f5 100644 --- a/plugins/gtkui/prefwin.c +++ b/plugins/gtkui/prefwin.c @@ -239,7 +239,6 @@ prefwin_add_hotkeys_tab (GtkWidget *prefwin) { GtkWidget *hbuttonbox3; GtkWidget *addhotkey; GtkWidget *removehotkey; - GtkWidget *applyhotkeys; GtkWidget *label66; GtkWidget *notebook2 = lookup_widget (prefwin, "notebook"); @@ -281,10 +280,8 @@ prefwin_add_hotkeys_tab (GtkWidget *prefwin) { gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), npages-1), label66); GLADE_HOOKUP_OBJECT (prefwin, hotkeystree, "hotkeystree"); -// GLADE_HOOKUP_OBJECT (prefwin, hbuttonbox3, "hbuttonbox3"); GLADE_HOOKUP_OBJECT (prefwin, addhotkey, "addhotkey"); GLADE_HOOKUP_OBJECT (prefwin, removehotkey, "removehotkey"); - GLADE_HOOKUP_OBJECT (prefwin, applyhotkeys, "applyhotkeys"); GtkTreeView *hktree = GTK_TREE_VIEW (lookup_widget (prefwin, "hotkeystree")); GtkListStore *hkstore = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); |