[geany/geany] 1658ba: Remove obsolete GTK compatibility code

Colomban Wendling git-noreply at xxxxx
Tue Jul 14 13:44:47 UTC 2015


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Tue, 14 Jul 2015 13:44:47 UTC
Commit:      1658babe452f58f37c84ebcfb34df97e14726351
             https://github.com/geany/geany/commit/1658babe452f58f37c84ebcfb34df97e14726351

Log Message:
-----------
Remove obsolete GTK compatibility code


Modified Paths:
--------------
    plugins/classbuilder.c
    src/about.c
    src/gtkcompat.h
    src/prefs.c

Modified: plugins/classbuilder.c
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -436,7 +436,6 @@ static void show_dialog_create_class(gint type)
 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			GTK_STOCK_OK, GTK_RESPONSE_OK,
 			NULL);
-	gtk_dialog_set_has_separator(GTK_DIALOG(cc_dlg->dialog), TRUE);
 
 	switch (type)
 	{


Modified: src/about.c
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -170,7 +170,6 @@ static GtkWidget *create_dialog(void)
 	gtk_widget_set_name(dialog, "GeanyDialog");
 	gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 	g_signal_connect(dialog, "key-press-event", G_CALLBACK(gb_on_key_pressed), NULL);
 
 	/* create header */


Modified: src/gtkcompat.h
8 lines changed, 0 insertions(+), 8 deletions(-)
===================================================================
@@ -62,14 +62,6 @@ G_BEGIN_DECLS
 #	define gtk_combo_box_text_get_active_text	gtk_combo_box_get_active_text
 #endif
 
-/* GtkDialog */
-/* GTK 2.22 deprecated dialog separators and 3.0 removed them
- * We keep those however in case 2.16 has separators by default */
-#if GTK_CHECK_VERSION(3, 0, 0)
-#	define gtk_dialog_set_has_separator(dialog, setting)	/* nothing */
-#	define GTK_DIALOG_NO_SEPARATOR							0
-#endif
-
 /* GtkWidget */
 #if ! GTK_CHECK_VERSION(3, 0, 0)
 #	define gtk_widget_get_allocated_height(widget)	(((GtkWidget *) (widget))->allocation.height)


Modified: src/prefs.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -178,7 +178,7 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd
 			gchar *str;
 
 			dialog = gtk_dialog_new_with_buttons(_("Grab Key"), GTK_WINDOW(ui_widgets.prefs_dialog),
-					GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+					GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list