No longer require Gtk+ >= 2.10 for settings(1)
This commit is contained in:
parent
bd625a4482
commit
eeafc74b70
|
@ -104,10 +104,8 @@ static gboolean _settings_on_closex(gpointer data);
|
||||||
static gboolean _settings_on_filter_view(GtkTreeModel * model,
|
static gboolean _settings_on_filter_view(GtkTreeModel * model,
|
||||||
GtkTreeIter * iter, gpointer data);
|
GtkTreeIter * iter, gpointer data);
|
||||||
static gboolean _settings_on_idle(gpointer data);
|
static gboolean _settings_on_idle(gpointer data);
|
||||||
#if GTK_CHECK_VERSION(2, 10, 0)
|
|
||||||
static void _settings_on_item_activated(GtkWidget * widget, GtkTreePath * path,
|
static void _settings_on_item_activated(GtkWidget * widget, GtkTreePath * path,
|
||||||
gpointer data);
|
gpointer data);
|
||||||
#endif
|
|
||||||
|
|
||||||
static int _settings(void)
|
static int _settings(void)
|
||||||
{
|
{
|
||||||
|
@ -149,10 +147,8 @@ static int _settings(void)
|
||||||
gtk_icon_view_set_text_column(GTK_ICON_VIEW(settings.view), SC_NAME);
|
gtk_icon_view_set_text_column(GTK_ICON_VIEW(settings.view), SC_NAME);
|
||||||
gtk_icon_view_set_selection_mode(GTK_ICON_VIEW(settings.view),
|
gtk_icon_view_set_selection_mode(GTK_ICON_VIEW(settings.view),
|
||||||
GTK_SELECTION_SINGLE);
|
GTK_SELECTION_SINGLE);
|
||||||
#if GTK_CHECK_VERSION(2, 10, 0)
|
|
||||||
g_signal_connect(settings.view, "item-activated", G_CALLBACK(
|
g_signal_connect(settings.view, "item-activated", G_CALLBACK(
|
||||||
_settings_on_item_activated), &settings);
|
_settings_on_item_activated), &settings);
|
||||||
#endif
|
|
||||||
gtk_container_add(GTK_CONTAINER(widget), settings.view);
|
gtk_container_add(GTK_CONTAINER(widget), settings.view);
|
||||||
gtk_container_add(GTK_CONTAINER(settings.window), widget);
|
gtk_container_add(GTK_CONTAINER(settings.window), widget);
|
||||||
gtk_widget_show_all(settings.window);
|
gtk_widget_show_all(settings.window);
|
||||||
|
@ -189,7 +185,6 @@ static gboolean _settings_on_idle(gpointer data)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GTK_CHECK_VERSION(2, 10, 0)
|
|
||||||
static void _settings_on_item_activated(GtkWidget * widget, GtkTreePath * path,
|
static void _settings_on_item_activated(GtkWidget * widget, GtkTreePath * path,
|
||||||
gpointer data)
|
gpointer data)
|
||||||
{
|
{
|
||||||
|
@ -215,7 +210,6 @@ static void _settings_on_item_activated(GtkWidget * widget, GtkTreePath * path,
|
||||||
_settings_error(error->message, 1);
|
_settings_error(error->message, 1);
|
||||||
g_free(exec);
|
g_free(exec);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* accessors */
|
/* accessors */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user