diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-04-10 15:23:15 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-04-10 15:23:15 +0100 |
| commit | 1922eb1e2a688c1927ab05436dec5043c31b8e78 (patch) | |
| tree | 07bb31f551557701abd8ed01e93339e6cecdf2b8 | |
| parent | 98f8acdfe572cc9805b4bf492ca91e802e578ea1 (diff) | |
| download | netsurf-1922eb1e2a688c1927ab05436dec5043c31b8e78.tar.gz netsurf-1922eb1e2a688c1927ab05436dec5043c31b8e78.tar.bz2 | |
remove no longer required gtk_dialog_get_action_area compatability interface
| -rw-r--r-- | gtk/compat.c | 9 | ||||
| -rw-r--r-- | gtk/compat.h | 1 | ||||
| -rw-r--r-- | gtk/theme.c | 13 |
3 files changed, 10 insertions, 13 deletions
diff --git a/gtk/compat.c b/gtk/compat.c index f65f3acc7..c00e7b3fe 100644 --- a/gtk/compat.c +++ b/gtk/compat.c @@ -377,15 +377,6 @@ GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog) #endif } -GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog) -{ -#if GTK_CHECK_VERSION(2,14,0) - return gtk_dialog_get_action_area(dialog); -#else - return dialog->action_area; -#endif -} - gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, diff --git a/gtk/compat.h b/gtk/compat.h index eeeeac4c0..a5fd33ce8 100644 --- a/gtk/compat.h +++ b/gtk/compat.h @@ -177,7 +177,6 @@ gulong nsgtk_connect_draw_event(GtkWidget *widget, GCallback callback, gpointer void nsgdk_cursor_unref(GdkCursor *cursor); void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc); GdkWindow *nsgtk_widget_get_window(GtkWidget *widget); -GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog); GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog); gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error); GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout); diff --git a/gtk/theme.c b/gtk/theme.c index 1e6541641..3a13640b6 100644 --- a/gtk/theme.c +++ b/gtk/theme.c @@ -260,16 +260,21 @@ void nsgtk_theme_add(const char *themename) /* notification that theme was added successfully */ notification = gtk_dialog_new_with_buttons(messages_get("gtkThemeAdd"), - NULL, GTK_DIALOG_DESTROY_WITH_PARENT, NSGTK_STOCK_OK, - GTK_RESPONSE_NONE, NULL); + NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, + NSGTK_STOCK_OK, GTK_RESPONSE_NONE, + NULL, NULL); if (notification == NULL) { warn_user(messages_get("NoMemory"), 0); return; } + len = SLEN("\t\t\t\t\t\t") + strlen(messages_get("gtkThemeAdd")) + 1; + char labelcontent[len]; snprintf(labelcontent, len, "\t\t\t%s\t\t\t", messages_get("gtkThemeAdd")); + label = gtk_label_new(labelcontent); if (label == NULL) { warn_user(messages_get("NoMemory"), 0); @@ -277,7 +282,9 @@ void nsgtk_theme_add(const char *themename) } g_signal_connect_swapped(notification, "response", G_CALLBACK(gtk_widget_destroy), notification); - gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_action_area(GTK_DIALOG(notification))), label); + + gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_content_area(GTK_DIALOG(notification))), label); + gtk_widget_show_all(notification); /* update combo */ |