From: <mgo...@us...> - 2016-05-01 22:25:03
|
Revision: 1080 http://sourceforge.net/p/osmo-pim/code/1080 Author: mgordienko Date: 2016-05-01 22:25:00 +0000 (Sun, 01 May 2016) Log Message: ----------- Fixed the compilation errors with GTK 3.10 Modified Paths: -------------- trunk/src/backup.c trunk/src/calendar.c trunk/src/calendar_calc.c trunk/src/calendar_fullyear.c trunk/src/calendar_ical.c trunk/src/calendar_jumpto.c trunk/src/calendar_preferences_gui.c trunk/src/calendar_print.c trunk/src/calendar_timeline.c trunk/src/contacts_export.c trunk/src/contacts_import.c trunk/src/contacts_items.c trunk/src/gui.c trunk/src/notes.c trunk/src/notes_items.c trunk/src/tasks_items.c trunk/src/utils_gui.c Modified: trunk/src/backup.c =================================================================== --- trunk/src/backup.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/backup.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -276,8 +276,8 @@ bck_p1_entry = gtk_entry_new (); gtk_widget_show (bck_p1_entry); gtk_container_add (GTK_CONTAINER (frame), bck_p1_entry); - gtk_widget_set_margin_start(bck_p1_entry, 16); - gtk_widget_set_margin_end(bck_p1_entry, 4); + gtk_widget_set_margin_left(bck_p1_entry, 16); + gtk_widget_set_margin_right(bck_p1_entry, 4); gtk_widget_set_margin_top(bck_p1_entry, 4); gtk_widget_set_margin_bottom(bck_p1_entry, 4); gtk_entry_set_invisible_char (GTK_ENTRY (bck_p1_entry), 8226); @@ -297,8 +297,8 @@ bck_p2_entry = gtk_entry_new (); gtk_widget_show (bck_p2_entry); gtk_container_add (GTK_CONTAINER (frame), bck_p2_entry); - gtk_widget_set_margin_start(bck_p2_entry, 16); - gtk_widget_set_margin_end(bck_p2_entry, 4); + gtk_widget_set_margin_left(bck_p2_entry, 16); + gtk_widget_set_margin_right(bck_p2_entry, 4); gtk_widget_set_margin_top(bck_p2_entry, 4); gtk_widget_set_margin_bottom(bck_p2_entry, 4); gtk_entry_set_invisible_char (GTK_ENTRY (bck_p2_entry), 8226); @@ -508,8 +508,8 @@ pass_entry = gtk_entry_new (); gtk_widget_show (pass_entry); gtk_container_add (GTK_CONTAINER (frame), pass_entry); - gtk_widget_set_margin_start(pass_entry, 16); - gtk_widget_set_margin_end(pass_entry, 4); + gtk_widget_set_margin_left(pass_entry, 16); + gtk_widget_set_margin_right(pass_entry, 4); gtk_widget_set_margin_top(pass_entry, 4); gtk_widget_set_margin_bottom(pass_entry, 4); gtk_entry_set_invisible_char (GTK_ENTRY (pass_entry), 8226); Modified: trunk/src/calendar.c =================================================================== --- trunk/src/calendar.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/calendar.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -2248,7 +2248,7 @@ appGUI->cal->day_info_scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (appGUI->cal->day_info_scrolledwindow); #ifndef HAVE_LIBWEBKIT - gtk_widget_set_margin_start(appGUI->cal->day_info_scrolledwindow, 8); + gtk_widget_set_margin_left(appGUI->cal->day_info_scrolledwindow, 8); #endif /* HAVE_LIBWEBKIT */ gtk_container_add (GTK_CONTAINER (frame), appGUI->cal->day_info_scrolledwindow); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (appGUI->cal->day_info_scrolledwindow), Modified: trunk/src/calendar_calc.c =================================================================== --- trunk/src/calendar_calc.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/calendar_calc.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -685,8 +685,8 @@ hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (hbox1); - gtk_widget_set_margin_start(hbox1, 16); - gtk_widget_set_margin_end(hbox1, 4); + gtk_widget_set_margin_left(hbox1, 16); + gtk_widget_set_margin_right(hbox1, 4); gtk_widget_set_margin_top(hbox1, 4); gtk_widget_set_margin_bottom(hbox1, 4); gtk_container_add (GTK_CONTAINER (frame), hbox1); @@ -842,8 +842,8 @@ hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (hbox2); - gtk_widget_set_margin_start(hbox2, 16); - gtk_widget_set_margin_end(hbox2, 4); + gtk_widget_set_margin_left(hbox2, 16); + gtk_widget_set_margin_right(hbox2, 4); gtk_widget_set_margin_top(hbox2, 4); gtk_widget_set_margin_bottom(hbox2, 4); gtk_container_add (GTK_CONTAINER (frame), hbox2); @@ -1009,8 +1009,8 @@ vbox_result = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox_result); - gtk_widget_set_margin_start(vbox_result, 20); - gtk_widget_set_margin_end(vbox_result, 8); + gtk_widget_set_margin_left(vbox_result, 20); + gtk_widget_set_margin_right(vbox_result, 8); gtk_widget_set_margin_top(vbox_result, 8); gtk_widget_set_margin_bottom(vbox_result, 8); gtk_container_add (GTK_CONTAINER (frame), vbox_result); @@ -1075,8 +1075,8 @@ vbox22 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox22); - gtk_widget_set_margin_start(vbox22, 16); - gtk_widget_set_margin_end(vbox22, 4); + gtk_widget_set_margin_left(vbox22, 16); + gtk_widget_set_margin_right(vbox22, 4); gtk_widget_set_margin_top(vbox22, 4); gtk_widget_set_margin_bottom(vbox22, 4); gtk_container_add (GTK_CONTAINER (frame), vbox22); @@ -1257,7 +1257,7 @@ vbox10 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox10); - gtk_widget_set_margin_start(vbox10, 12); + gtk_widget_set_margin_left(vbox10, 12); gtk_container_add (GTK_CONTAINER (frame), vbox10); table = gtk_grid_new (); @@ -1399,8 +1399,8 @@ hbox12 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_widget_show (hbox12); - gtk_widget_set_margin_start(hbox12, 20); - gtk_widget_set_margin_end(hbox12, 8); + gtk_widget_set_margin_left(hbox12, 20); + gtk_widget_set_margin_right(hbox12, 8); gtk_widget_set_margin_top(hbox12, 8); gtk_widget_set_margin_bottom(hbox12, 8); gtk_container_add (GTK_CONTAINER (frame), hbox12); Modified: trunk/src/calendar_fullyear.c =================================================================== --- trunk/src/calendar_fullyear.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/calendar_fullyear.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -513,8 +513,8 @@ gtk_widget_show (label); gtk_grid_attach (GTK_GRID (appGUI->cal->fycal_table_1), label, 0, month + 1, 1, 1); - gtk_widget_set_margin_start (label, 8); - gtk_widget_set_margin_end (label, 8); + gtk_widget_set_margin_left (label, 8); + gtk_widget_set_margin_right (label, 8); gtk_label_set_markup (GTK_LABEL (label), tmpbuf); if (config.fy_simple_view == FALSE) { @@ -522,8 +522,8 @@ gtk_widget_show (label); gtk_grid_attach (GTK_GRID (appGUI->cal->fycal_table_1), label, FULL_YEAR_COLS + 3, month + 1, 1, 1); - gtk_widget_set_margin_start (label, 8); - gtk_widget_set_margin_end (label, 8); + gtk_widget_set_margin_left (label, 8); + gtk_widget_set_margin_right (label, 8); gtk_label_set_markup (GTK_LABEL (label), tmpbuf); } } @@ -546,8 +546,8 @@ label = gtk_label_new (NULL); gtk_widget_show (label); gtk_grid_attach (GTK_GRID (appGUI->cal->fycal_table_1), label, i + 2, 0, 1, 1); - gtk_widget_set_margin_start (label, 4); - gtk_widget_set_margin_end (label, 4); + gtk_widget_set_margin_left (label, 4); + gtk_widget_set_margin_right (label, 4); if (rotate) gtk_label_set_angle (GTK_LABEL (label), 90); gtk_label_set_markup (GTK_LABEL (label), tmpbuf); @@ -556,8 +556,8 @@ label = gtk_label_new (NULL); gtk_widget_show (label); gtk_grid_attach (GTK_GRID (appGUI->cal->fycal_table_1), label, i + 2, MAX_MONTHS + 3, 1, 1); - gtk_widget_set_margin_start (label, 4); - gtk_widget_set_margin_end (label, 4); + gtk_widget_set_margin_left (label, 4); + gtk_widget_set_margin_right (label, 4); if (rotate) gtk_label_set_angle (GTK_LABEL (label), 90); gtk_label_set_markup (GTK_LABEL (label), tmpbuf); Modified: trunk/src/calendar_ical.c =================================================================== --- trunk/src/calendar_ical.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/calendar_ical.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -1534,7 +1534,7 @@ vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_widget_show (vbox2); - gtk_widget_set_margin_start(vbox2, 12); + gtk_widget_set_margin_left(vbox2, 12); gtk_container_add (GTK_CONTAINER (frame), vbox2); hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); @@ -1706,7 +1706,7 @@ hbox3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_widget_show (hbox3); - gtk_widget_set_margin_start(hbox3, 12); + gtk_widget_set_margin_left(hbox3, 12); gtk_container_add (GTK_CONTAINER (frame), hbox3); appGUI->cal->output_file_entry = gtk_entry_new (); Modified: trunk/src/calendar_jumpto.c =================================================================== --- trunk/src/calendar_jumpto.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/calendar_jumpto.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -226,8 +226,8 @@ label = gtk_label_new (tmpbuf); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); - gtk_widget_set_margin_start (label, 8); - gtk_widget_set_margin_end (label, 8); + gtk_widget_set_margin_left (label, 8); + gtk_widget_set_margin_right (label, 8); appGUI->cal->day_entry = gtk_entry_new (); gtk_widget_show (appGUI->cal->day_entry); @@ -241,8 +241,8 @@ label = gtk_label_new (tmpbuf); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); - gtk_widget_set_margin_start (label, 8); - gtk_widget_set_margin_end (label, 8); + gtk_widget_set_margin_left (label, 8); + gtk_widget_set_margin_right (label, 8); appGUI->cal->month_entry = gtk_entry_new (); gtk_widget_show (appGUI->cal->month_entry); @@ -256,8 +256,8 @@ label = gtk_label_new (tmpbuf); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); - gtk_widget_set_margin_start (label, 8); - gtk_widget_set_margin_end (label, 8); + gtk_widget_set_margin_left (label, 8); + gtk_widget_set_margin_right (label, 8); appGUI->cal->year_entry = gtk_entry_new (); gtk_widget_show (appGUI->cal->year_entry); Modified: trunk/src/calendar_preferences_gui.c =================================================================== --- trunk/src/calendar_preferences_gui.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/calendar_preferences_gui.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -1655,7 +1655,7 @@ i++; gtk_widget_set_hexpand(checkbutton, TRUE); checkbutton = gtk_check_button_new_with_mnemonic (_("Show seconds")); - gtk_widget_set_margin_start(checkbutton, 16); + gtk_widget_set_margin_left(checkbutton, 16); gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_current_time_seconds); g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI); Modified: trunk/src/calendar_print.c =================================================================== --- trunk/src/calendar_print.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/calendar_print.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -580,7 +580,7 @@ table_fonts = gtk_grid_new (); gtk_widget_show (table_fonts); - gtk_widget_set_margin_start(table_fonts, 12); + gtk_widget_set_margin_left(table_fonts, 12); gtk_container_add (GTK_CONTAINER (frame1), table_fonts); gtk_grid_set_row_spacing (GTK_GRID (table_fonts), 4); gtk_grid_set_column_spacing (GTK_GRID (table_fonts), 4); @@ -699,7 +699,7 @@ vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox2); - gtk_widget_set_margin_start(vbox2, 12); + gtk_widget_set_margin_left(vbox2, 12); gtk_container_add (GTK_CONTAINER (frame2), vbox2); appGUI->cal->print_tasks_checkbutton = gtk_check_button_new_with_mnemonic (_("Tasks")); @@ -763,7 +763,7 @@ table5 = gtk_grid_new (); gtk_widget_show (table5); - gtk_widget_set_margin_start(table5, 12); + gtk_widget_set_margin_left(table5, 12); gtk_container_add (GTK_CONTAINER (frame3), table5); gtk_grid_set_row_spacing (GTK_GRID (table5), 4); gtk_grid_set_column_spacing (GTK_GRID (table5), 4); Modified: trunk/src/calendar_timeline.c =================================================================== --- trunk/src/calendar_timeline.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/calendar_timeline.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -182,7 +182,7 @@ gtk_container_set_border_width (GTK_CONTAINER (timeline_table), 4); gtk_grid_set_column_spacing (GTK_GRID (timeline_table), 8); gtk_grid_set_row_spacing (GTK_GRID (timeline_table), 4); - gtk_widget_set_margin_start(timeline_table, 12); + gtk_widget_set_margin_left(timeline_table, 12); gtk_widget_set_margin_bottom(timeline_table, 12); gtk_container_add (GTK_CONTAINER (frame), timeline_table); Modified: trunk/src/contacts_export.c =================================================================== --- trunk/src/contacts_export.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/contacts_export.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -908,7 +908,7 @@ vbox4 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox4); - gtk_widget_set_margin_start(vbox4, 12); + gtk_widget_set_margin_left(vbox4, 12); gtk_container_add (GTK_CONTAINER (frame), vbox4); gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8); @@ -929,7 +929,7 @@ vbox4 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox4); - gtk_widget_set_margin_start(vbox4, 12); + gtk_widget_set_margin_left(vbox4, 12); gtk_container_add (GTK_CONTAINER (frame), vbox4); gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8); @@ -962,7 +962,7 @@ scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow); - gtk_widget_set_margin_start(scrolledwindow, 12); + gtk_widget_set_margin_left(scrolledwindow, 12); gtk_container_add (GTK_CONTAINER (frame), scrolledwindow); gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 8); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -1033,7 +1033,7 @@ hbox3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_widget_show (hbox3); - gtk_widget_set_margin_start(hbox3, 12); + gtk_widget_set_margin_left(hbox3, 12); gtk_container_add (GTK_CONTAINER (frame), hbox3); appGUI->cnt->output_file_entry = gtk_entry_new (); Modified: trunk/src/contacts_import.c =================================================================== --- trunk/src/contacts_import.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/contacts_import.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -265,7 +265,7 @@ hbox4 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (hbox4); - gtk_widget_set_margin_start(hbox4, 12); + gtk_widget_set_margin_left(hbox4, 12); gtk_container_add (GTK_CONTAINER (frame), hbox4); appGUI->cnt->input_file_entry = gtk_entry_new (); @@ -296,7 +296,7 @@ vbox4 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox4); - gtk_widget_set_margin_start(vbox4, 12); + gtk_widget_set_margin_left(vbox4, 12); gtk_container_add (GTK_CONTAINER (frame), vbox4); hbox6 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); @@ -712,16 +712,16 @@ appGUI->cnt->n_records_label = gtk_label_new (tmpbuf); gtk_widget_show (appGUI->cnt->n_records_label); gtk_box_pack_end (GTK_BOX (hbox1), appGUI->cnt->n_records_label, FALSE, FALSE, 0); - gtk_widget_set_margin_start (appGUI->cnt->n_records_label, 6); - gtk_widget_set_margin_end (appGUI->cnt->n_records_label, 6); + gtk_widget_set_margin_left (appGUI->cnt->n_records_label, 6); + gtk_widget_set_margin_right (appGUI->cnt->n_records_label, 6); g_snprintf(tmpbuf, BUFFER_SIZE, "<b>%s</b>", _("of")); label = gtk_label_new (tmpbuf); gtk_widget_show (label); gtk_box_pack_end (GTK_BOX (hbox1), label, FALSE, FALSE, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_widget_set_margin_start (label, 6); - gtk_widget_set_margin_end (label, 6); + gtk_widget_set_margin_left (label, 6); + gtk_widget_set_margin_right (label, 6); appGUI->cnt->current_record_spinbutton_adj = gtk_adjustment_new (1, 1, n_records, 1, 10, 0); appGUI->cnt->current_record_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (appGUI->cnt->current_record_spinbutton_adj), 1, 0); @@ -735,23 +735,23 @@ gtk_widget_show (label); gtk_box_pack_end (GTK_BOX (hbox1), label, FALSE, FALSE, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_widget_set_margin_start (label, 6); - gtk_widget_set_margin_end (label, 6); + gtk_widget_set_margin_left (label, 6); + gtk_widget_set_margin_right (label, 6); g_snprintf(tmpbuf, BUFFER_SIZE, "<b>%s:</b>", _("Number fields per record")); label = gtk_label_new (tmpbuf); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_widget_set_margin_start (label, 6); - gtk_widget_set_margin_end (label, 6); + gtk_widget_set_margin_left (label, 6); + gtk_widget_set_margin_right (label, 6); g_snprintf(tmpbuf, BUFFER_SIZE, "%d", appGUI->cnt->max_fields); max_fields_label = gtk_label_new (tmpbuf); gtk_widget_show (max_fields_label); gtk_box_pack_start (GTK_BOX (hbox1), max_fields_label, FALSE, FALSE, 0); - gtk_widget_set_margin_start (max_fields_label, 6); - gtk_widget_set_margin_end (max_fields_label, 6); + gtk_widget_set_margin_left (max_fields_label, 6); + gtk_widget_set_margin_right (max_fields_label, 6); hseparator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_show (hseparator); @@ -820,8 +820,8 @@ gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_valign(label, GTK_ALIGN_START); gtk_widget_set_halign(label, GTK_ALIGN_CENTER); - gtk_widget_set_margin_start (label, 8); - gtk_widget_set_margin_end (label, 8); + gtk_widget_set_margin_left (label, 8); + gtk_widget_set_margin_right (label, 8); g_snprintf(tmpbuf, BUFFER_SIZE, "<b>%s:</b>", _("Value")); label = gtk_label_new (tmpbuf); @@ -830,8 +830,8 @@ gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_valign(label, GTK_ALIGN_START); gtk_widget_set_halign(label, GTK_ALIGN_CENTER); - gtk_widget_set_margin_start (label, 8); - gtk_widget_set_margin_end (label, 8); + gtk_widget_set_margin_left (label, 8); + gtk_widget_set_margin_right (label, 8); appGUI->cnt->value_labels[i] = gtk_label_new (""); gtk_widget_show (appGUI->cnt->value_labels[i]); @@ -840,8 +840,8 @@ gtk_widget_set_size_request (appGUI->cnt->value_labels[i], 50, -1); gtk_widget_set_valign(appGUI->cnt->value_labels[i], GTK_ALIGN_START); gtk_widget_set_halign(appGUI->cnt->value_labels[i], GTK_ALIGN_CENTER); - gtk_widget_set_margin_start (appGUI->cnt->value_labels[i], 8); - gtk_widget_set_margin_end (appGUI->cnt->value_labels[i], 8); + gtk_widget_set_margin_left (appGUI->cnt->value_labels[i], 8); + gtk_widget_set_margin_right (appGUI->cnt->value_labels[i], 8); appGUI->cnt->field_type_comboboxes[i] = gtk_combo_box_text_new (); gtk_widget_show (appGUI->cnt->field_type_comboboxes[i]); Modified: trunk/src/contacts_items.c =================================================================== --- trunk/src/contacts_items.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/contacts_items.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -431,8 +431,8 @@ msg_selected.appGUI = msg->appGUI; g_signal_connect (G_OBJECT (msg->appGUI->cnt->select_date_calendar), "day_selected_double_click", G_CALLBACK (select_date_selected_cb), &msg_selected); - gtk_widget_set_margin_start(msg->appGUI->cnt->select_date_calendar, 4); - gtk_widget_set_margin_end(msg->appGUI->cnt->select_date_calendar, 4); + gtk_widget_set_margin_left(msg->appGUI->cnt->select_date_calendar, 4); + gtk_widget_set_margin_right(msg->appGUI->cnt->select_date_calendar, 4); gtk_widget_set_margin_top(msg->appGUI->cnt->select_date_calendar, 4); gtk_widget_set_margin_bottom(msg->appGUI->cnt->select_date_calendar, 4); gtk_box_pack_start (GTK_BOX (vbox1), msg->appGUI->cnt->select_date_calendar, TRUE, TRUE, 0); @@ -442,8 +442,8 @@ (config.display_options & GUI_CALENDAR_WEEK_START_MONDAY)); hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - gtk_widget_set_margin_start(hbox1, 4); - gtk_widget_set_margin_end(hbox1, 4); + gtk_widget_set_margin_left(hbox1, 4); + gtk_widget_set_margin_right(hbox1, 4); gtk_widget_set_margin_top(hbox1, 4); gtk_widget_set_margin_bottom(hbox1, 4); gtk_widget_show (hbox1); @@ -644,16 +644,16 @@ gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_valign(label, GTK_ALIGN_START); gtk_widget_set_halign(label, GTK_ALIGN_CENTER); - gtk_widget_set_margin_start (label, 5); - gtk_widget_set_margin_end (label, 5); + gtk_widget_set_margin_left (label, 5); + gtk_widget_set_margin_right (label, 5); pos++; g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", _("Group")); label = gtk_label_new (tmpbuf); gtk_widget_show (label); - gtk_widget_set_margin_start(label, 4); - gtk_widget_set_margin_end(label, 4); + gtk_widget_set_margin_left(label, 4); + gtk_widget_set_margin_right(label, 4); gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1); gtk_widget_set_halign(label, GTK_ALIGN_START); @@ -676,8 +676,8 @@ g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[i*2])); label = gtk_label_new (tmpbuf); gtk_widget_show (label); - gtk_widget_set_margin_start(label, 4); - gtk_widget_set_margin_end(label, 4); + gtk_widget_set_margin_left(label, 4); + gtk_widget_set_margin_right(label, 4); gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1); gtk_widget_set_halign(label, GTK_ALIGN_START); @@ -726,8 +726,8 @@ g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[COLUMN_NAME_DAY_DATE*2])); label = gtk_label_new (tmpbuf); gtk_widget_show (label); - gtk_widget_set_margin_start(label, 4); - gtk_widget_set_margin_end(label, 4); + gtk_widget_set_margin_left(label, 4); + gtk_widget_set_margin_right(label, 4); gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1); gtk_widget_set_halign(label, GTK_ALIGN_START); @@ -754,8 +754,8 @@ g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[COLUMN_PHOTO*2])); label = gtk_label_new (tmpbuf); gtk_widget_show (label); - gtk_widget_set_margin_start(label, 4); - gtk_widget_set_margin_end(label, 4); + gtk_widget_set_margin_left(label, 4); + gtk_widget_set_margin_right(label, 4); gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1); gtk_widget_set_halign(label, GTK_ALIGN_START); @@ -793,8 +793,8 @@ gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_widget_set_margin_start (label, 5); - gtk_widget_set_margin_end (label, 5); + gtk_widget_set_margin_left (label, 5); + gtk_widget_set_margin_right (label, 5); pos++; @@ -803,8 +803,8 @@ g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(contact_replace_tags[i-COLUMN_HOME_ADDRESS])); label = gtk_label_new (tmpbuf); gtk_widget_show (label); - gtk_widget_set_margin_start(label, 4); - gtk_widget_set_margin_end(label, 4); + gtk_widget_set_margin_left(label, 4); + gtk_widget_set_margin_right(label, 4); gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1); gtk_widget_set_halign(label, GTK_ALIGN_START); @@ -828,8 +828,8 @@ gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_widget_set_margin_start (label, 5); - gtk_widget_set_margin_end (label, 5); + gtk_widget_set_margin_left (label, 5); + gtk_widget_set_margin_right (label, 5); pos++; @@ -842,8 +842,8 @@ } label = gtk_label_new (tmpbuf); gtk_widget_show (label); - gtk_widget_set_margin_start(label, 4); - gtk_widget_set_margin_end(label, 4); + gtk_widget_set_margin_left(label, 4); + gtk_widget_set_margin_right(label, 4); gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1); gtk_widget_set_halign(label, GTK_ALIGN_START); @@ -867,8 +867,8 @@ gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_widget_set_margin_start (label, 5); - gtk_widget_set_margin_end (label, 5); + gtk_widget_set_margin_left (label, 5); + gtk_widget_set_margin_right (label, 5); pos++; @@ -876,8 +876,8 @@ g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[i*2])); label = gtk_label_new (tmpbuf); - gtk_widget_set_margin_start(label, 4); - gtk_widget_set_margin_end(label, 4); + gtk_widget_set_margin_left(label, 4); + gtk_widget_set_margin_right(label, 4); gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1); gtk_widget_set_halign(label, GTK_ALIGN_START); @@ -924,8 +924,8 @@ gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_widget_set_margin_start (label, 5); - gtk_widget_set_margin_end (label, 5); + gtk_widget_set_margin_left (label, 5); + gtk_widget_set_margin_right (label, 5); pos++; @@ -934,8 +934,8 @@ g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[i*2])); label = gtk_label_new (tmpbuf); gtk_widget_show (label); - gtk_widget_set_margin_start(label, 4); - gtk_widget_set_margin_end(label, 4); + gtk_widget_set_margin_left(label, 4); + gtk_widget_set_margin_right(label, 4); gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1); gtk_widget_set_halign(label, GTK_ALIGN_START); @@ -994,8 +994,8 @@ gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_widget_set_margin_start (label, 5); - gtk_widget_set_margin_end (label, 5); + gtk_widget_set_margin_left (label, 5); + gtk_widget_set_margin_right (label, 5); pos++; Modified: trunk/src/gui.c =================================================================== --- trunk/src/gui.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/gui.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -1326,8 +1326,8 @@ GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); GtkWidget *label = gtk_label_new(text); - gtk_widget_set_margin_start(label, 6); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_widget_set_margin_left(label, 6); + gtk_widget_set_halign(label, GTK_ALIGN_START); gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(box), label, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(menu_item), box); Modified: trunk/src/notes.c =================================================================== --- trunk/src/notes.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/notes.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -1190,7 +1190,7 @@ for (i = 0, nbtns = gtk_toolbar_get_n_items(appGUI->nte->editor_toolbar); i < nbtns; i++) { GtkToolItem *item = gtk_toolbar_get_nth_item(appGUI->nte->editor_toolbar, i); - if (GTK_IS_TOOL_BUTTON(item) == true) { + if (GTK_IS_TOOL_BUTTON(item) == TRUE) { gtk_widget_set_sensitive(GTK_WIDGET(item), !s); } } Modified: trunk/src/notes_items.c =================================================================== --- trunk/src/notes_items.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/notes_items.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -225,8 +225,8 @@ appGUI->nte->note_name_entry = gtk_entry_new (); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->note_name_entry); - gtk_widget_set_margin_start(appGUI->nte->note_name_entry, 16); - gtk_widget_set_margin_end(appGUI->nte->note_name_entry, 4); + gtk_widget_set_margin_left(appGUI->nte->note_name_entry, 16); + gtk_widget_set_margin_right(appGUI->nte->note_name_entry, 4); gtk_widget_set_margin_top(appGUI->nte->note_name_entry, 4); gtk_widget_set_margin_bottom(appGUI->nte->note_name_entry, 4); gtk_entry_set_invisible_char (GTK_ENTRY (appGUI->nte->note_name_entry), 8226); @@ -244,8 +244,8 @@ appGUI->nte->category_combobox = gtk_combo_box_text_new (); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->category_combobox); - gtk_widget_set_margin_start(appGUI->nte->category_combobox, 16); - gtk_widget_set_margin_end(appGUI->nte->category_combobox, 4); + gtk_widget_set_margin_left(appGUI->nte->category_combobox, 16); + gtk_widget_set_margin_right(appGUI->nte->category_combobox, 4); gtk_widget_set_margin_top(appGUI->nte->category_combobox, 4); gtk_widget_set_margin_bottom(appGUI->nte->category_combobox, 4); gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (appGUI->nte->category_combobox), NULL, _("None")); @@ -262,8 +262,8 @@ appGUI->nte->remember_cursor_checkbutton = gtk_check_button_new_with_mnemonic (_("Remember cursor position")); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->remember_cursor_checkbutton); gtk_widget_set_can_focus (appGUI->nte->remember_cursor_checkbutton, FALSE); - gtk_widget_set_margin_start(appGUI->nte->remember_cursor_checkbutton, 16); - gtk_widget_set_margin_end(appGUI->nte->remember_cursor_checkbutton, 4); + gtk_widget_set_margin_left(appGUI->nte->remember_cursor_checkbutton, 16); + gtk_widget_set_margin_right(appGUI->nte->remember_cursor_checkbutton, 4); gtk_widget_set_margin_top(appGUI->nte->remember_cursor_checkbutton, 4); gtk_widget_set_margin_bottom(appGUI->nte->remember_cursor_checkbutton, 4); @@ -620,8 +620,8 @@ appGUI->nte->note_name_entry = gtk_entry_new (); gtk_widget_show (appGUI->nte->note_name_entry); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->note_name_entry); - gtk_widget_set_margin_start(appGUI->nte->note_name_entry, 16); - gtk_widget_set_margin_end(appGUI->nte->note_name_entry, 4); + gtk_widget_set_margin_left(appGUI->nte->note_name_entry, 16); + gtk_widget_set_margin_right(appGUI->nte->note_name_entry, 4); gtk_widget_set_margin_top(appGUI->nte->note_name_entry, 4); gtk_widget_set_margin_bottom(appGUI->nte->note_name_entry, 4); gtk_entry_set_invisible_char (GTK_ENTRY (appGUI->nte->note_name_entry), 8226); @@ -642,8 +642,8 @@ appGUI->nte->category_combobox = gtk_combo_box_text_new (); gtk_widget_show (appGUI->nte->category_combobox); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->category_combobox); - gtk_widget_set_margin_start(appGUI->nte->category_combobox, 16); - gtk_widget_set_margin_end(appGUI->nte->category_combobox, 4); + gtk_widget_set_margin_left(appGUI->nte->category_combobox, 16); + gtk_widget_set_margin_right(appGUI->nte->category_combobox, 4); gtk_widget_set_margin_top(appGUI->nte->category_combobox, 4); gtk_widget_set_margin_bottom(appGUI->nte->category_combobox, 4); gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (appGUI->nte->category_combobox), NULL, _("None")); @@ -675,8 +675,8 @@ hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (hbox1); gtk_container_add (GTK_CONTAINER (frame), hbox1); - gtk_widget_set_margin_start(hbox1, 16); - gtk_widget_set_margin_end(hbox1, 4); + gtk_widget_set_margin_left(hbox1, 16); + gtk_widget_set_margin_right(hbox1, 4); gtk_widget_set_margin_top(hbox1, 4); gtk_widget_set_margin_bottom(hbox1, 4); @@ -710,8 +710,8 @@ appGUI->nte->password_entry = gtk_entry_new (); gtk_widget_show (appGUI->nte->password_entry); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->password_entry); - gtk_widget_set_margin_start(appGUI->nte->password_entry, 16); - gtk_widget_set_margin_end(appGUI->nte->password_entry, 4); + gtk_widget_set_margin_left(appGUI->nte->password_entry, 16); + gtk_widget_set_margin_right(appGUI->nte->password_entry, 4); gtk_widget_set_margin_top(appGUI->nte->password_entry, 4); gtk_widget_set_margin_bottom(appGUI->nte->password_entry, 4); gtk_entry_set_invisible_char (GTK_ENTRY (appGUI->nte->password_entry), 8226); @@ -734,8 +734,8 @@ appGUI->nte->spassword_entry = gtk_entry_new (); gtk_widget_show (appGUI->nte->spassword_entry); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->spassword_entry); - gtk_widget_set_margin_start(appGUI->nte->spassword_entry, 16); - gtk_widget_set_margin_end(appGUI->nte->spassword_entry, 4); + gtk_widget_set_margin_left(appGUI->nte->spassword_entry, 16); + gtk_widget_set_margin_right(appGUI->nte->spassword_entry, 4); gtk_widget_set_margin_top(appGUI->nte->spassword_entry, 4); gtk_widget_set_margin_bottom(appGUI->nte->spassword_entry, 4); gtk_entry_set_invisible_char (GTK_ENTRY (appGUI->nte->spassword_entry), 8226); @@ -763,8 +763,8 @@ gtk_widget_set_can_focus(appGUI->nte->remember_cursor_checkbutton, FALSE); gtk_widget_show (appGUI->nte->remember_cursor_checkbutton); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->remember_cursor_checkbutton); - gtk_widget_set_margin_start(appGUI->nte->remember_cursor_checkbutton, 16); - gtk_widget_set_margin_end(appGUI->nte->remember_cursor_checkbutton, 4); + gtk_widget_set_margin_left(appGUI->nte->remember_cursor_checkbutton, 16); + gtk_widget_set_margin_right(appGUI->nte->remember_cursor_checkbutton, 4); gtk_widget_set_margin_top(appGUI->nte->remember_cursor_checkbutton, 4); gtk_widget_set_margin_bottom(appGUI->nte->remember_cursor_checkbutton, 4); @@ -1000,8 +1000,8 @@ appGUI->nte->password_entry = gtk_entry_new (); gtk_widget_show (appGUI->nte->password_entry); gtk_container_add (GTK_CONTAINER (frame), appGUI->nte->password_entry); - gtk_widget_set_margin_start(appGUI->nte->password_entry, 16); - gtk_widget_set_margin_end(appGUI->nte->password_entry, 4); + gtk_widget_set_margin_left(appGUI->nte->password_entry, 16); + gtk_widget_set_margin_right(appGUI->nte->password_entry, 4); gtk_widget_set_margin_top(appGUI->nte->password_entry, 4); gtk_widget_set_margin_bottom(appGUI->nte->password_entry, 4); gtk_entry_set_invisible_char (GTK_ENTRY (appGUI->nte->password_entry), 8226); Modified: trunk/src/tasks_items.c =================================================================== --- trunk/src/tasks_items.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/tasks_items.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -376,8 +376,8 @@ (config.display_options & GUI_CALENDAR_WEEK_START_MONDAY)); gtk_widget_set_valign(appGUI->tsk->td_calendar, GTK_ALIGN_FILL); gtk_widget_set_halign(appGUI->tsk->td_calendar, GTK_ALIGN_FILL); - gtk_widget_set_margin_start(appGUI->tsk->td_calendar, 4); - gtk_widget_set_margin_end(appGUI->tsk->td_calendar, 4); + gtk_widget_set_margin_left(appGUI->tsk->td_calendar, 4); + gtk_widget_set_margin_right(appGUI->tsk->td_calendar, 4); gtk_widget_set_margin_top(appGUI->tsk->td_calendar, 4); gtk_widget_set_margin_bottom(appGUI->tsk->td_calendar, 4); gtk_box_pack_start (GTK_BOX (vbox1), appGUI->tsk->td_calendar, TRUE, TRUE, 0); @@ -719,7 +719,7 @@ gtk_widget_set_sensitive(appGUI->tsk->checkb_sound_enable, FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(appGUI->tsk->checkb_sound_enable), TRUE); gtk_widget_set_halign(appGUI->tsk->checkb_sound_enable, GTK_ALIGN_START); - gtk_widget_set_margin_start(appGUI->tsk->checkb_sound_enable, 6); + gtk_widget_set_margin_left(appGUI->tsk->checkb_sound_enable, 6); gtk_grid_attach(GTK_GRID(grid), appGUI->tsk->checkb_sound_enable, 0, 6, 2, 1); appGUI->tsk->checkb_ndialog_enable = gtk_check_button_new_with_mnemonic(_("Enable notification dialog")); @@ -1009,7 +1009,7 @@ gtk_frame_set_label_widget(GTK_FRAME(frame), label); appGUI->tsk->ignore_alarm_checkbutton = gtk_check_button_new_with_mnemonic(_("Ignore alarm when task expired offline")); - gtk_widget_set_margin_start(appGUI->tsk->ignore_alarm_checkbutton, 6); + gtk_widget_set_margin_left(appGUI->tsk->ignore_alarm_checkbutton, 6); gtk_container_add(GTK_CONTAINER(frame), appGUI->tsk->ignore_alarm_checkbutton); return frame; @@ -1123,8 +1123,8 @@ /* First Tab */ basic_tab = create_basic_tab(appGUI); - gtk_widget_set_margin_start(basic_tab, 6); - gtk_widget_set_margin_end(basic_tab, 6); + gtk_widget_set_margin_left(basic_tab, 6); + gtk_widget_set_margin_right(basic_tab, 6); gtk_widget_set_margin_top(basic_tab, 6); gtk_widget_set_margin_bottom(basic_tab, 6); label = gtk_label_new (_("Basic")); @@ -1134,8 +1134,8 @@ /* Second Tab */ advanced_tab = create_advanced_tab(appGUI); - gtk_widget_set_margin_start(advanced_tab, 6); - gtk_widget_set_margin_end(advanced_tab, 6); + gtk_widget_set_margin_left(advanced_tab, 6); + gtk_widget_set_margin_right(advanced_tab, 6); gtk_widget_set_margin_top(advanced_tab, 6); gtk_widget_set_margin_bottom(advanced_tab, 6); label = gtk_label_new (_("Advanced")); @@ -1147,8 +1147,8 @@ tasks_related_set_state (FALSE, FALSE, appGUI); hseparator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_widget_set_margin_start(hseparator, 6); - gtk_widget_set_margin_end(hseparator, 6); + gtk_widget_set_margin_left(hseparator, 6); + gtk_widget_set_margin_right(hseparator, 6); gtk_widget_show (hseparator); gtk_box_pack_start (GTK_BOX (vbox0), hseparator, FALSE, FALSE, 0); Modified: trunk/src/utils_gui.c =================================================================== --- trunk/src/utils_gui.c 2016-04-25 21:38:52 UTC (rev 1079) +++ trunk/src/utils_gui.c 2016-05-01 22:25:00 UTC (rev 1080) @@ -74,8 +74,8 @@ gtk_frame_set_label_widget(GTK_FRAME(frame), label); gtk_container_add(GTK_CONTAINER(frame), widget); - gtk_widget_set_margin_start(widget, ALIGNMENT_PADDING_LEFT); - gtk_widget_set_margin_end(widget, ALIGNMENT_PADDING_RIGHT); + gtk_widget_set_margin_left(widget, ALIGNMENT_PADDING_LEFT); + gtk_widget_set_margin_right(widget, ALIGNMENT_PADDING_RIGHT); gtk_widget_set_margin_top(widget, ALIGNMENT_PADDING_TOP); gtk_widget_set_margin_bottom(widget, ALIGNMENT_PADDING_BOTTOM); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |