summaryrefslogtreecommitdiff
path: root/src/caja-location-bar.h
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2016-07-04 13:27:22 +0200
committerraveit65 <[email protected]>2016-07-11 22:28:14 +0200
commitc75269f5b317ffa20142d640108ab64b85835e09 (patch)
tree8cc7176bcb1fe618de8d51c5e8df51d3ef82f431 /src/caja-location-bar.h
parent5968f6bb40c334a797175ebeeb946d76163ce288 (diff)
downloadcaja-c75269f5b317ffa20142d640108ab64b85835e09.tar.bz2
caja-c75269f5b317ffa20142d640108ab64b85835e09.tar.xz
navigation-bar: remove useless abstract class
Merge the useful pieces into CajaLocationBar itself, which is the only implementor anyway. taken from: https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-6&id=ca1fa0c https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=66c46dd
Diffstat (limited to 'src/caja-location-bar.h')
-rw-r--r--src/caja-location-bar.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/caja-location-bar.h b/src/caja-location-bar.h
index 4f29373b..aa2a9521 100644
--- a/src/caja-location-bar.h
+++ b/src/caja-location-bar.h
@@ -30,7 +30,6 @@
#ifndef CAJA_LOCATION_BAR_H
#define CAJA_LOCATION_BAR_H
-#include "caja-navigation-bar.h"
#include "caja-navigation-window.h"
#include "caja-navigation-window-pane.h"
#include <libcaja-private/caja-entry.h>
@@ -52,13 +51,16 @@ typedef struct CajaLocationBarDetails CajaLocationBarDetails;
typedef struct CajaLocationBar
{
- CajaNavigationBar parent;
+ GtkHBox parent;
CajaLocationBarDetails *details;
} CajaLocationBar;
typedef struct
{
- CajaNavigationBarClass parent_class;
+ GtkHBoxClass parent_class;
+
+ /* for GtkBindingSet */
+ void (* cancel) (CajaLocationBar *bar);
} CajaLocationBarClass;
GType caja_location_bar_get_type (void);
@@ -67,4 +69,8 @@ void caja_location_bar_set_active (CajaLocationBar *location_bar,
gboolean is_active);
CajaEntry * caja_location_bar_get_entry (CajaLocationBar *location_bar);
+void caja_location_bar_activate (CajaLocationBar *bar);
+void caja_location_bar_set_location (CajaLocationBar *bar,
+ const char *location);
+
#endif /* CAJA_LOCATION_BAR_H */