diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2016-10-23 11:45:23 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-10-23 11:45:23 -0400 |
| commit | e0d00f10c50104ce1a77d035c9c2fc14545c0b92 (patch) | |
| tree | e70bdc4879a8cdaf77dce5ff389d8e73cfddd4c3 /src/trg-toolbar.c | |
| parent | 4e526acfb28ca68322009c5a958b9926cf3c8413 (diff) | |
| parent | 7c29748eee49c59ad09831924f4bbefc9b7ee5f5 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'src/trg-toolbar.c')
| -rw-r--r-- | src/trg-toolbar.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/trg-toolbar.c b/src/trg-toolbar.c index 96dd95d..cb870d3 100644 --- a/src/trg-toolbar.c +++ b/src/trg-toolbar.c @@ -17,6 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <glib/gi18n.h> #include <gtk/gtk.h> @@ -143,7 +147,7 @@ trg_toolbar_install_widget_prop(GObjectClass * class, guint propId, G_PARAM_STATIC_BLURB)); } -GtkWidget *trg_toolbar_item_new(TrgToolbar * toolbar, +static GtkWidget *trg_toolbar_item_new(TrgToolbar * toolbar, gchar * text, int *index, gchar * icon, gboolean sensitive) @@ -229,8 +233,8 @@ static GObject *trg_toolbar_constructor(GType type, GTK_STOCK_REMOVE, FALSE); priv->tb_delete = - trg_toolbar_item_new(TRG_TOOLBAR(obj), _("Remove with data"), - &position, GTK_STOCK_CLEAR, FALSE); + trg_toolbar_item_new(TRG_TOOLBAR(obj), _("Remove and delete data"), + &position, GTK_STOCK_DELETE, FALSE); separator = gtk_separator_tool_item_new(); gtk_toolbar_insert(GTK_TOOLBAR(obj), separator, position++); @@ -243,10 +247,6 @@ static GObject *trg_toolbar_constructor(GType type, trg_toolbar_item_new(TRG_TOOLBAR(obj), _("Remote Preferences"), &position, GTK_STOCK_NETWORK, FALSE); -#if !GTK_CHECK_VERSION( 3, 0, 0 ) - gtk_toolbar_set_tooltips(GTK_TOOLBAR(obj), TRUE); -#endif - g_signal_connect(G_OBJECT(priv->prefs), "pref-profile-changed", G_CALLBACK(trg_toolbar_refresh_menu), obj); |