File gtkterm-0001-build_fixes-0.99.7.diff of Package gtkterm

Overview Repositories Revisions Requests Users Attributes Meta

File gtkterm-0001-build_fixes-0.99.7.diff of Package gtkterm (Revision 663480927112ab65022d7565a8025d9c)

Currently displaying revision 663480927112ab65022d7565a8025d9c , Show latest

diff -urN gtkterm-0.99.7-rc1/src/fichier.c gtkterm-0.99.7-rc1-patch/src/fichier.c
--- gtkterm-0.99.7-rc1/src/fichier.c	2011-10-31 02:50:22.000000000 +0200
+++ gtkterm-0.99.7-rc1-patch/src/fichier.c	2013-03-11 12:59:03.000000000 +0200
@@ -132,7 +132,7 @@
 	gtk_window_set_title(GTK_WINDOW(Window), msg);
 	g_free(msg);
 	Box = gtk_vbox_new(TRUE, 10);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(Window)->vbox), Box);
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtk_dialog_get_content_area(Window))), Box);
 	ProgressBar = gtk_progress_bar_new();
 	
 	gtk_box_pack_start(GTK_BOX(Box), ProgressBar, FALSE, FALSE, 5);
@@ -140,7 +140,7 @@
 	Bouton_annuler = gtk_button_new_with_label(_("Cancel"));
 	gtk_signal_connect_object(GTK_OBJECT(Bouton_annuler), "clicked", GTK_SIGNAL_FUNC(close_all), NULL);
 
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(Window)->action_area), Bouton_annuler);
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(Window))), Bouton_annuler);
 
 	gtk_signal_connect_object(GTK_OBJECT(Window), "delete_event", GTK_SIGNAL_FUNC(close_all), NULL);
 
diff -urN gtkterm-0.99.7-rc1/src/macros.c gtkterm-0.99.7-rc1-patch/src/macros.c
--- gtkterm-0.99.7-rc1/src/macros.c	2011-10-31 02:50:22.000000000 +0200
+++ gtkterm-0.99.7-rc1-patch/src/macros.c	2013-03-11 12:59:03.000000000 +0200
@@ -429,7 +429,7 @@
   gtk_signal_connect_object(GTK_OBJECT(Bouton), "clicked", (GtkSignalFunc)gtk_widget_destroy, GTK_OBJECT(Dialogue));
   gtk_signal_connect(GTK_OBJECT(Dialogue), "destroy", (GtkSignalFunc)gtk_widget_destroy, NULL);
   gtk_signal_connect(GTK_OBJECT(Dialogue), "delete_event", (GtkSignalFunc)gtk_widget_destroy, NULL);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(Dialogue))), Bouton, TRUE, TRUE, 0);
 
   Label = gtk_label_new(_("The \"action\" field of a macro is the data to be sent on the port. Text can be entered, but also special chars, like \\n, \\t, \\r, etc. You can also enter hexadecimal data preceded by a '\\'. The hexadecimal data should not begin with a letter (eg. use \\0FF and not \\FF)\nExamples :\n\t\"Hello\\n\" sends \"Hello\" followed by a Line Feed\n\t\"Hello\\0A\" does the same thing but the LF is entered in hexadecimal"));
   gtk_label_set_line_wrap(GTK_LABEL (Label), TRUE);
@@ -438,7 +438,7 @@
 
   Frame = gtk_frame_new(NULL);
   gtk_container_set_border_width(GTK_CONTAINER(Frame), 5);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->vbox), Frame, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(Dialogue))), Frame, FALSE, FALSE, 0);
   gtk_container_add(GTK_CONTAINER(Frame), Label);
 
   gtk_widget_show_all(Dialogue);
diff -urN gtkterm-0.99.7-rc1/src/term_config.c gtkterm-0.99.7-rc1-patch/src/term_config.c
--- gtkterm-0.99.7-rc1/src/term_config.c	2011-10-31 02:50:22.000000000 +0200
+++ gtkterm-0.99.7-rc1-patch/src/term_config.c	2013-03-11 13:00:38.630966685 +0200
@@ -186,10 +186,10 @@
 
     Dialogue = gtk_dialog_new();
     gtk_window_set_title(GTK_WINDOW(Dialogue), _("Configuration"));
-    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(Dialogue)->vbox), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(Dialogue))), 5);
 
     Frame = gtk_frame_new(_("Serial port"));
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->vbox), Frame, FALSE, TRUE, 5);
+    gtk_box_pack_start(GTK_BOX(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(Dialogue)))), Frame, FALSE, TRUE, 5);
 
     Table = gtk_table_new(4, 3, FALSE);
     gtk_container_add(GTK_CONTAINER(Frame), Table);
@@ -227,7 +227,7 @@
     Combos[0] = Combo;
 
     Combo = gtk_combo_box_entry_new_text();
-    gtk_entry_set_max_length(GTK_ENTRY(GTK_BIN(Combo)->child), 10);
+    gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(Combo))), 10);
     gtk_combo_box_append_text(GTK_COMBO_BOX(Combo), "300");
     gtk_combo_box_append_text(GTK_COMBO_BOX(Combo), "600");
     gtk_combo_box_append_text(GTK_COMBO_BOX(Combo), "1200");
@@ -242,7 +242,7 @@
     gtk_combo_box_set_active(GTK_COMBO_BOX(Combo), 5); //default 9600
 
     //validate input text (digits only)
-    g_signal_connect(GTK_ENTRY(GTK_BIN(Combo)->child),
+    g_signal_connect(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(Combo))),
 		     "insert-text",
 		     G_CALLBACK(check_text_input), NULL);
 
@@ -327,7 +327,7 @@
     Expander = gtk_expander_new_with_mnemonic(_("Advanced Configuration Options"));
     ExpanderVbox = gtk_vbox_new(FALSE, 0);
     gtk_container_add(GTK_CONTAINER(Expander), ExpanderVbox);
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(Dialogue)->vbox), Expander);
+    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(Dialogue))), Expander);
 
     Frame = gtk_frame_new(_("ASCII file transfer"));
     gtk_container_add(GTK_CONTAINER(ExpanderVbox), Frame);
@@ -392,12 +392,12 @@
 
 
     Bouton_OK = gtk_button_new_from_stock(GTK_STOCK_OK);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton_OK, FALSE, TRUE, 0);
+    gtk_box_pack_start(gtk_dialog_get_action_area(GTK_DIALOG(Dialogue)), Bouton_OK, FALSE, TRUE, 0);
     g_signal_connect(GTK_OBJECT(Bouton_OK), "clicked", G_CALLBACK(Lis_Config), (gpointer)Combos);
     g_signal_connect_swapped(GTK_OBJECT(Bouton_OK), "clicked", G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(Dialogue));
     Bouton_annule = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
     g_signal_connect_swapped(GTK_OBJECT(Bouton_annule), "clicked", G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(Dialogue));
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton_annule, FALSE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area (GTK_DIALOG(Dialogue))), Bouton_annule, FALSE, TRUE, 0);
 
     gtk_widget_show_all(Dialogue);
 
@@ -492,9 +492,9 @@
     fontsel = (GtkFontSelectionDialog *)gtk_font_selection_dialog_new(_("Font selection"));
     g_signal_connect(GTK_OBJECT(fontsel), "delete-event", G_CALLBACK(gtk_widget_destroy), NULL);
     g_signal_connect(GTK_OBJECT(fontsel), "destroy", G_CALLBACK(gtk_widget_destroy), NULL);
-    g_signal_connect_swapped(GTK_OBJECT(fontsel->cancel_button), "clicked", G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(fontsel));
-    g_signal_connect_swapped(GTK_OBJECT(fontsel->ok_button), "clicked", G_CALLBACK(Lis_Font), GTK_OBJECT(fontsel));
-    g_signal_connect_swapped(GTK_OBJECT(fontsel->ok_button), "clicked", G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(fontsel));
+    g_signal_connect_swapped(GTK_OBJECT(gtk_font_selection_dialog_get_cancel_button(fontsel)), "clicked", G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(fontsel));
+    g_signal_connect_swapped(GTK_OBJECT(gtk_font_selection_dialog_get_ok_button(fontsel)), "clicked", G_CALLBACK(Lis_Font), GTK_OBJECT(fontsel));
+    g_signal_connect_swapped(GTK_OBJECT(gtk_font_selection_dialog_get_ok_button(fontsel)), "clicked", G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(fontsel));
     gtk_font_selection_dialog_set_font_name(fontsel, term_conf.font);
 
     gtk_widget_show(GTK_WIDGET(fontsel));
@@ -630,7 +630,7 @@
 	g_signal_connect(GTK_OBJECT(dialog), "response", G_CALLBACK (callback), GTK_TREE_SELECTION(Selection_Liste));
 	g_signal_connect_swapped(GTK_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), GTK_WIDGET(dialog));
 
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), Frame);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), Frame);
 
 	gtk_widget_show_all (dialog);
     }
@@ -662,7 +662,7 @@
     g_signal_connect(GTK_OBJECT(dialog), "response", G_CALLBACK(save_config), GTK_ENTRY(entry));
     g_signal_connect_swapped(GTK_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), GTK_WIDGET(dialog));
 
-    gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), box);
+    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), box);
 
     gtk_widget_show_all (dialog);
 }
@@ -753,7 +753,7 @@
 		g_signal_connect(GTK_OBJECT(dialog), "response", G_CALLBACK(really_save_config), (gpointer)text);
 		g_signal_connect_swapped(GTK_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), GTK_WIDGET(dialog));
 
-		gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), label);
+		gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), label);
 
 		gtk_widget_show_all (dialog);
 
@@ -1465,7 +1465,7 @@
     gtk_box_pack_start(GTK_BOX(BoiteH), Entry, FALSE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(BoiteV), BoiteH, FALSE, TRUE, 0);
 
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(Dialog)->vbox), BoiteV);
+    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(Dialog))), BoiteV);
 
     g_signal_connect_swapped(GTK_OBJECT(Dialog), "response", G_CALLBACK(gtk_widget_destroy), GTK_WIDGET(Dialog));
 
@@ -1494,7 +1494,7 @@
     gchar *string;
 
     Fenetre = gtk_color_selection_dialog_new ("Changing text color");
-    colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (Fenetre)->colorsel);
+    colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG (Fenetre)));
     gtk_color_selection_set_previous_color (colorsel, &term_conf.foreground_color);
     gtk_color_selection_set_current_color (colorsel, &term_conf.foreground_color);
 
@@ -1535,7 +1535,7 @@
     gchar *string;
 
     Fenetre = gtk_color_selection_dialog_new ("Changing background color");
-    colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (Fenetre)->colorsel);
+    colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG (Fenetre)));
     gtk_color_selection_set_previous_color (colorsel, &term_conf.background_color);
     gtk_color_selection_set_current_color (colorsel, &term_conf.background_color);

Places

File gtkterm-0001-build_fixes-0.99.7.diff of Package gtkterm (Revision 663480927112ab65022d7565a8025d9c)

Places