DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed loads of warnings with Gtk+ 3

Browse Source
This commit is contained in:
Pierre Pronchery 2014-09-28 21:20:40 +02:00
parent f8a0b7cdea
commit 5e5ab9cba4
13 changed files with 231 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/modems/debug.c
View File

@ -116,8 +116,13 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
notebook = gtk_notebook_new(); notebook = gtk_notebook_new();
/* status */ /* status */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Status:"); widget = gtk_label_new("Status:");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -127,7 +132,11 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
gtk_box_pack_start(GTK_BOX(hbox), debug->status, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), debug->status, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* operator */ /* operator */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Operator: "); widget = gtk_label_new("Operator: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -141,7 +150,11 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
_debug_on_operator_set), debug); _debug_on_operator_set), debug);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(NULL); widget = gtk_label_new(NULL);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
@ -151,8 +164,13 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
gtk_label_new("Status")); gtk_label_new("Status"));
/* calls */ /* calls */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Number: "); widget = gtk_label_new("Number: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -160,7 +178,11 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
debug->ca_number = gtk_entry_new(); debug->ca_number = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox), debug->ca_number, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), debug->ca_number, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Direction: "); widget = gtk_label_new("Direction: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -185,7 +207,11 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
gtk_combo_box_set_active(GTK_COMBO_BOX(debug->ca_direction), 1); gtk_combo_box_set_active(GTK_COMBO_BOX(debug->ca_direction), 1);
gtk_box_pack_start(GTK_BOX(hbox), debug->ca_direction, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), debug->ca_direction, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_button_new_with_label("Call"); widget = gtk_button_new_with_label("Call");
gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name( gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name(
"call-start", GTK_ICON_SIZE_BUTTON)); "call-start", GTK_ICON_SIZE_BUTTON));
@ -196,8 +222,13 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
gtk_label_new("Calls")); gtk_label_new("Calls"));
/* messages */ /* messages */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Number: "); widget = gtk_label_new("Number: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -205,7 +236,11 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
debug->me_number = gtk_entry_new(); debug->me_number = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox), debug->me_number, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), debug->me_number, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Folder: "); widget = gtk_label_new("Folder: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -241,7 +276,11 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
debug->me_message = gtk_text_view_new(); debug->me_message = gtk_text_view_new();
gtk_container_add(GTK_CONTAINER(widget), debug->me_message); gtk_container_add(GTK_CONTAINER(widget), debug->me_message);
gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_button_new_with_label("Send"); widget = gtk_button_new_with_label("Send");
gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name( gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name(
"mail-send", GTK_ICON_SIZE_BUTTON)); "mail-send", GTK_ICON_SIZE_BUTTON));
@ -252,8 +291,13 @@ static ModemPlugin * _debug_init(ModemPluginHelper * helper)
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
gtk_label_new("Messages")); gtk_label_new("Messages"));
/* notification */ /* notification */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Notification: "); widget = gtk_label_new("Notification: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);

4
src/plugins/blacklist.c
View File

@ -154,7 +154,11 @@ static void _blacklist_settings(Blacklist * blacklist)
gtk_window_set_title(GTK_WINDOW(blacklist->window), "Blacklisting"); gtk_window_set_title(GTK_WINDOW(blacklist->window), "Blacklisting");
g_signal_connect_swapped(blacklist->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(blacklist->window, "delete-event", G_CALLBACK(
_on_settings_closex), blacklist); _on_settings_closex), blacklist);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
#endif
/* toolbar */ /* toolbar */
widget = gtk_toolbar_new(); widget = gtk_toolbar_new();
toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_NEW); toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_NEW);

20
src/plugins/debug.c
View File

@ -185,9 +185,13 @@ static Debug * _debug_init(PhonePluginHelper * helper)
g_signal_connect_swapped(debug->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(debug->window, "delete-event", G_CALLBACK(
_debug_on_closex), debug); _debug_on_closex), debug);
/* vbox */ /* vbox */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
/* modem requests */
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
debug->requests = gtk_combo_box_text_new(); debug->requests = gtk_combo_box_text_new();
@ -209,7 +213,11 @@ static Debug * _debug_init(PhonePluginHelper * helper)
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* modem triggers */ /* modem triggers */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
debug->triggers = gtk_combo_box_text_new(); debug->triggers = gtk_combo_box_text_new();
@ -271,8 +279,13 @@ static void _debug_on_queue_request(gpointer data)
size_t i; size_t i;
ModemRequest request; ModemRequest request;
#if GTK_CHECK_VERSION(3, 0, 0)
if((text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(
debug->requests))) == NULL)
#else
if((text = gtk_combo_box_get_active_text(GTK_COMBO_BOX( if((text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
debug->requests))) == NULL) debug->requests))) == NULL)
#endif
return; return;
for(i = 0; _debug_modem_requests[i].name != NULL; i++) for(i = 0; _debug_modem_requests[i].name != NULL; i++)
if(strcmp(_debug_modem_requests[i].name, text) == 0) if(strcmp(_debug_modem_requests[i].name, text) == 0)
@ -290,8 +303,13 @@ static void _debug_on_queue_trigger(gpointer data)
gchar * text; gchar * text;
size_t i; size_t i;
#if GTK_CHECK_VERSION(3, 0, 0)
if((text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(
debug->triggers))) == NULL)
#else
if((text = gtk_combo_box_get_active_text(GTK_COMBO_BOX( if((text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
debug->triggers))) == NULL) debug->triggers))) == NULL)
#endif
return; return;
for(i = 0; _debug_modem_triggers[i].name != NULL; i++) for(i = 0; _debug_modem_triggers[i].name != NULL; i++)
if(strcmp(_debug_modem_triggers[i].name, text) == 0) if(strcmp(_debug_modem_triggers[i].name, text) == 0)

8
src/plugins/engineering.c
View File

@ -219,7 +219,11 @@ static Engineering * _engineering_init(PhonePluginHelper * helper)
"Engineering mode"); "Engineering mode");
g_signal_connect_swapped(engineering->window, "delete-event", g_signal_connect_swapped(engineering->window, "delete-event",
G_CALLBACK(_on_engineering_closex), engineering); G_CALLBACK(_on_engineering_closex), engineering);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
#endif
/* toolbar */ /* toolbar */
toolbar = gtk_toolbar_new(); toolbar = gtk_toolbar_new();
engineering->tb_play = gtk_toggle_tool_button_new_from_stock( engineering->tb_play = gtk_toggle_tool_button_new_from_stock(
@ -236,7 +240,11 @@ static Engineering * _engineering_init(PhonePluginHelper * helper)
-1); -1);
gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, TRUE, 0);
/* serving cell view */ /* serving cell view */
#if GTK_CHECK_VERSION(3, 0, 0)
paned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
#else
paned = gtk_vpaned_new(); paned = gtk_vpaned_new();
#endif
frame = gtk_frame_new("Serving cell"); frame = gtk_frame_new("Serving cell");
engineering->sc_store = gtk_list_store_new(SC_COL_COUNT, engineering->sc_store = gtk_list_store_new(SC_COL_COUNT,
G_TYPE_STRING, /* SC_COL_FREQUENCY */ G_TYPE_STRING, /* SC_COL_FREQUENCY */

48
src/plugins/gprs.c
View File

@ -302,7 +302,11 @@ static void _gprs_settings(GPRS * gprs)
gtk_window_set_title(GTK_WINDOW(gprs->window), "Dial-up networking"); gtk_window_set_title(GTK_WINDOW(gprs->window), "Dial-up networking");
g_signal_connect_swapped(gprs->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(gprs->window, "delete-event", G_CALLBACK(
_settings_on_closex), gprs); _settings_on_closex), gprs);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
gprs->notebook = gtk_notebook_new(); gprs->notebook = gtk_notebook_new();
/* preferences */ /* preferences */
widget = _settings_preferences(gprs); widget = _settings_preferences(gprs);
@ -314,7 +318,11 @@ static void _gprs_settings(GPRS * gprs)
gtk_label_new("Status")); gtk_label_new("Status"));
gtk_box_pack_start(GTK_BOX(vbox), gprs->notebook, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), gprs->notebook, TRUE, TRUE, 0);
/* button box */ /* button box */
#if GTK_CHECK_VERSION(3, 0, 0)
bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#else
bbox = gtk_hbutton_box_new(); bbox = gtk_hbutton_box_new();
#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 4); gtk_box_set_spacing(GTK_BOX(bbox), 4);
#ifdef PROGNAME #ifdef PROGNAME
@ -347,7 +355,11 @@ static GtkWidget * _settings_preferences(GPRS * gprs)
GtkWidget * vbox2; GtkWidget * vbox2;
GtkWidget * widget; GtkWidget * widget;
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
/* attachment */ /* attachment */
gprs->attach = gtk_check_button_new_with_label( gprs->attach = gtk_check_button_new_with_label(
"Force GPRS registration"); "Force GPRS registration");
@ -357,11 +369,19 @@ static GtkWidget * _settings_preferences(GPRS * gprs)
gtk_box_pack_start(GTK_BOX(vbox), gprs->systray, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), gprs->systray, FALSE, TRUE, 0);
/* credentials */ /* credentials */
frame = gtk_frame_new("Credentials"); frame = gtk_frame_new("Credentials");
#if GTK_CHECK_VERSION(3, 0, 0)
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox2 = gtk_vbox_new(FALSE, 4); vbox2 = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* access point */ /* access point */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Access point:"); widget = gtk_label_new("Access point:");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -370,7 +390,11 @@ static GtkWidget * _settings_preferences(GPRS * gprs)
gtk_box_pack_start(GTK_BOX(hbox), gprs->apn, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), gprs->apn, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* username */ /* username */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Username:"); widget = gtk_label_new("Username:");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -379,7 +403,11 @@ static GtkWidget * _settings_preferences(GPRS * gprs)
gtk_box_pack_start(GTK_BOX(hbox), gprs->username, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), gprs->username, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* password */ /* password */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Password:"); widget = gtk_label_new("Password:");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -390,7 +418,11 @@ static GtkWidget * _settings_preferences(GPRS * gprs)
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
#ifndef PROGNAME #ifndef PROGNAME
/* defaults */ /* defaults */
# if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
# else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
# endif
gprs->defaults = gtk_button_new_with_label("Load defaults"); gprs->defaults = gtk_button_new_with_label("Load defaults");
gtk_widget_set_sensitive(gprs->defaults, (gprs->_operator != NULL) gtk_widget_set_sensitive(gprs->defaults, (gprs->_operator != NULL)
? TRUE : FALSE); ? TRUE : FALSE);
@ -411,12 +443,24 @@ static GtkWidget * _settings_status(GPRS * gprs)
GtkWidget * widget; GtkWidget * widget;
GtkWidget * bbox; GtkWidget * bbox;
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
/* details */ /* details */
widget = gtk_frame_new("Details"); widget = gtk_frame_new("Details");
#if GTK_CHECK_VERSION(3, 0, 0)
bbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
bbox = gtk_vbox_new(FALSE, 4); bbox = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(bbox), 4); gtk_container_set_border_width(GTK_CONTAINER(bbox), 4);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
gprs->st_image = gtk_image_new_from_icon_name(GTK_STOCK_DISCONNECT, gprs->st_image = gtk_image_new_from_icon_name(GTK_STOCK_DISCONNECT,
GTK_ICON_SIZE_BUTTON); GTK_ICON_SIZE_BUTTON);
gtk_box_pack_start(GTK_BOX(hbox), gprs->st_image, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), gprs->st_image, FALSE, TRUE, 0);
@ -441,7 +485,11 @@ static GtkWidget * _settings_status(GPRS * gprs)
gtk_box_pack_start(GTK_BOX(vbox), gprs->connect, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), gprs->connect, FALSE, TRUE, 0);
/* counters */ /* counters */
widget = gtk_frame_new("Counters"); widget = gtk_frame_new("Counters");
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
hbox = gtk_vbox_new(FALSE, 4); hbox = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
gprs->st_glin = gtk_label_new(NULL); gprs->st_glin = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(gprs->st_glin), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(gprs->st_glin), 0.0, 0.5);

12
src/plugins/gps.c
View File

@ -113,9 +113,17 @@ static void _settings_window(GPS * gps)
gtk_window_set_title(GTK_WINDOW(gps->window), "GPS"); gtk_window_set_title(GTK_WINDOW(gps->window), "GPS");
g_signal_connect(gps->window, "delete-event", G_CALLBACK( g_signal_connect(gps->window, "delete-event", G_CALLBACK(
gtk_widget_hide), NULL); gtk_widget_hide), NULL);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
/* controls */ /* controls */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#else
hbox = gtk_hbutton_box_new(); hbox = gtk_hbutton_box_new();
#endif
widget = gtk_button_new_with_label("Start"); widget = gtk_button_new_with_label("Start");
g_signal_connect_swapped(widget, "clicked", g_signal_connect_swapped(widget, "clicked",
G_CALLBACK(_gps_on_settings_start), gps); G_CALLBACK(_gps_on_settings_start), gps);
@ -126,7 +134,11 @@ static void _settings_window(GPS * gps)
gtk_container_add(GTK_CONTAINER(hbox), widget); gtk_container_add(GTK_CONTAINER(hbox), widget);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* button box */ /* button box */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#else
hbox = gtk_hbutton_box_new(); hbox = gtk_hbutton_box_new();
#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(hbox), 4); gtk_box_set_spacing(GTK_BOX(hbox), 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE); widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);

11
src/plugins/notify.c
View File

@ -17,6 +17,9 @@
#include <System.h> #include <System.h>
#include <Desktop.h> #include <Desktop.h>
#if GTK_CHECK_VERSION(3, 0, 0)
# include <gtk/gtkx.h>
#endif
#if 0 /* XXX avoid a dependency on Panel */ #if 0 /* XXX avoid a dependency on Panel */
# include <Desktop/Panel.h> # include <Desktop/Panel.h>
#else #else
@ -131,12 +134,20 @@ static int _event_notification(NotifyPhonePlugin * notify, PhoneEvent * event)
} }
plug = gtk_plug_new(0); plug = gtk_plug_new(0);
gtk_container_set_border_width(GTK_CONTAINER(plug), 4); gtk_container_set_border_width(GTK_CONTAINER(plug), 4);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
/* icon */ /* icon */
widget = gtk_image_new_from_stock(stock, GTK_ICON_SIZE_DIALOG); widget = gtk_image_new_from_stock(stock, GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
/* title */ /* title */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
widget = gtk_label_new(title); widget = gtk_label_new(title);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.0); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.0);
gtk_widget_modify_font(widget, bold); gtk_widget_modify_font(widget, bold);

21
src/plugins/openmoko.c
View File

@ -512,7 +512,11 @@ static void _openmoko_settings(Openmoko * openmoko)
"Openmoko preferences"); "Openmoko preferences");
g_signal_connect_swapped(openmoko->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(openmoko->window, "delete-event", G_CALLBACK(
_settings_on_closex), openmoko); _settings_on_closex), openmoko);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
#endif
/* check button */ /* check button */
openmoko->deepsleep = gtk_check_button_new_with_label( openmoko->deepsleep = gtk_check_button_new_with_label(
"Prevent deep sleep"); "Prevent deep sleep");
@ -520,10 +524,19 @@ static void _openmoko_settings(Openmoko * openmoko)
/* hardware */ /* hardware */
frame = gtk_frame_new("Hardware"); frame = gtk_frame_new("Hardware");
gtk_container_set_border_width(GTK_CONTAINER(frame), 4); gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
#if GTK_CHECK_VERSION(3, 0, 0)
bbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_box_set_homogeneous(GTK_BOX(bbox), TRUE);
#else
bbox = gtk_vbox_new(TRUE, 4); bbox = gtk_vbox_new(TRUE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(bbox), 4); gtk_container_set_border_width(GTK_CONTAINER(bbox), 4);
/* bluetooth */ /* bluetooth */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("Bluetooth"); widget = gtk_label_new("Bluetooth");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
@ -534,7 +547,11 @@ static void _openmoko_settings(Openmoko * openmoko)
0); 0);
gtk_box_pack_start(GTK_BOX(bbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(bbox), hbox, FALSE, TRUE, 0);
/* GPS */ /* GPS */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new("GPS"); widget = gtk_label_new("GPS");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
@ -546,7 +563,11 @@ static void _openmoko_settings(Openmoko * openmoko)
gtk_container_add(GTK_CONTAINER(frame), bbox); gtk_container_add(GTK_CONTAINER(frame), bbox);
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
/* button box */ /* button box */
#if GTK_CHECK_VERSION(3, 0, 0)
bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#else
bbox = gtk_hbutton_box_new(); bbox = gtk_hbutton_box_new();
#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 4); gtk_box_set_spacing(GTK_BOX(bbox), 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);

8
src/plugins/oss.c
View File

@ -451,7 +451,11 @@ static void _oss_settings(OSS * oss)
gtk_window_set_title(GTK_WINDOW(oss->window), "Sound preferences"); gtk_window_set_title(GTK_WINDOW(oss->window), "Sound preferences");
g_signal_connect_swapped(oss->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(oss->window, "delete-event", G_CALLBACK(
_on_settings_closex), oss); _on_settings_closex), oss);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
/* devices */ /* devices */
widget = gtk_label_new("Sound device:"); widget = gtk_label_new("Sound device:");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
@ -468,7 +472,11 @@ static void _oss_settings(OSS * oss)
oss->mixer = widget; oss->mixer = widget;
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
/* button box */ /* button box */
#if GTK_CHECK_VERSION(3, 0, 0)
bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#else
bbox = gtk_hbutton_box_new(); bbox = gtk_hbutton_box_new();
#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 4); gtk_box_set_spacing(GTK_BOX(bbox), 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);

12
src/plugins/panel.c
View File

@ -140,7 +140,11 @@ static Panel * _panel_init(PhonePluginHelper * helper)
_on_plug_delete_event), panel); _on_plug_delete_event), panel);
g_signal_connect_swapped(panel->plug, "embedded", G_CALLBACK( g_signal_connect_swapped(panel->plug, "embedded", G_CALLBACK(
_on_plug_embedded), panel); _on_plug_embedded), panel);
#if GTK_CHECK_VERSION(3, 0, 0)
panel->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
#else
panel->hbox = gtk_hbox_new(FALSE, 2); panel->hbox = gtk_hbox_new(FALSE, 2);
#endif
/* battery */ /* battery */
panel->battery_timeout = 0; panel->battery_timeout = 0;
panel->battery_level = -1; panel->battery_level = -1;
@ -502,7 +506,11 @@ static void _panel_settings(Panel * panel)
gtk_window_set_title(GTK_WINDOW(panel->window), "Panel preferences"); gtk_window_set_title(GTK_WINDOW(panel->window), "Panel preferences");
g_signal_connect_swapped(panel->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(panel->window, "delete-event", G_CALLBACK(
_on_settings_closex), panel); _on_settings_closex), panel);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
#endif
/* check button */ /* check button */
panel->battery = gtk_check_button_new_with_label( panel->battery = gtk_check_button_new_with_label(
"Monitor battery activity"); "Monitor battery activity");
@ -511,7 +519,11 @@ static void _panel_settings(Panel * panel)
"Shorten the operator name"); "Shorten the operator name");
gtk_box_pack_start(GTK_BOX(vbox), panel->truncate, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), panel->truncate, FALSE, TRUE, 0);
/* button box */ /* button box */
#if GTK_CHECK_VERSION(3, 0, 0)
bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#else
bbox = gtk_hbutton_box_new(); bbox = gtk_hbutton_box_new();
#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 4); gtk_box_set_spacing(GTK_BOX(bbox), 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);

24
src/plugins/password.c
View File

@ -123,9 +123,17 @@ static void _password_settings(PasswordPhonePlugin * password)
gtk_window_set_title(GTK_WINDOW(password->window), "Password"); gtk_window_set_title(GTK_WINDOW(password->window), "Password");
g_signal_connect_swapped(password->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(password->window, "delete-event", G_CALLBACK(
_on_settings_closex), password); _on_settings_closex), password);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
/* entry */ /* entry */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
widget = gtk_label_new("Name: "); widget = gtk_label_new("Name: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -135,7 +143,11 @@ static void _password_settings(PasswordPhonePlugin * password)
gtk_box_pack_start(GTK_BOX(hbox), password->entry, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), password->entry, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* old password */ /* old password */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
widget = gtk_label_new("Old password: "); widget = gtk_label_new("Old password: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -145,7 +157,11 @@ static void _password_settings(PasswordPhonePlugin * password)
gtk_box_pack_start(GTK_BOX(hbox), password->oldpassword, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), password->oldpassword, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* new password */ /* new password */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
widget = gtk_label_new("New password: "); widget = gtk_label_new("New password: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -155,7 +171,11 @@ static void _password_settings(PasswordPhonePlugin * password)
gtk_box_pack_start(GTK_BOX(hbox), password->newpassword, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), password->newpassword, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* new password */ /* new password */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
widget = gtk_label_new("Confirm: "); widget = gtk_label_new("Confirm: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -166,7 +186,11 @@ static void _password_settings(PasswordPhonePlugin * password)
0); 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* buttons */ /* buttons */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#else
hbox = gtk_hbutton_box_new(); hbox = gtk_hbutton_box_new();
#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(hbox), 4); gtk_box_set_spacing(GTK_BOX(hbox), 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);

16
src/plugins/profiles.c
View File

@ -292,7 +292,11 @@ static void _profiles_settings(Profiles * profiles)
gtk_window_set_title(GTK_WINDOW(profiles->pr_window), "Profiles"); gtk_window_set_title(GTK_WINDOW(profiles->pr_window), "Profiles");
g_signal_connect_swapped(profiles->pr_window, "delete-event", g_signal_connect_swapped(profiles->pr_window, "delete-event",
G_CALLBACK(_on_settings_closex), profiles); G_CALLBACK(_on_settings_closex), profiles);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
#endif
/* combo */ /* combo */
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
profiles->pr_combo = gtk_combo_box_text_new(); profiles->pr_combo = gtk_combo_box_text_new();
@ -311,13 +315,21 @@ static void _profiles_settings(Profiles * profiles)
gtk_box_pack_start(GTK_BOX(vbox), profiles->pr_combo, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), profiles->pr_combo, FALSE, TRUE, 0);
/* frame */ /* frame */
frame = gtk_frame_new("Overview"); frame = gtk_frame_new("Overview");
#if GTK_CHECK_VERSION(3, 0, 0)
widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
widget = gtk_vbox_new(FALSE, 4); widget = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(widget), 4); gtk_container_set_border_width(GTK_CONTAINER(widget), 4);
profiles->pr_online = gtk_check_button_new_with_label("Online"); profiles->pr_online = gtk_check_button_new_with_label("Online");
gtk_widget_set_sensitive(profiles->pr_online, FALSE); gtk_widget_set_sensitive(profiles->pr_online, FALSE);
gtk_box_pack_start(GTK_BOX(widget), profiles->pr_online, FALSE, TRUE, gtk_box_pack_start(GTK_BOX(widget), profiles->pr_online, FALSE, TRUE,
0); 0);
#if GTK_CHECK_VERSION(3, 0, 0)
bbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
bbox = gtk_hbox_new(FALSE, 4); bbox = gtk_hbox_new(FALSE, 4);
#endif
profiles->pr_volume = gtk_label_new("Volume: "); profiles->pr_volume = gtk_label_new("Volume: ");
gtk_widget_set_sensitive(profiles->pr_volume, FALSE); gtk_widget_set_sensitive(profiles->pr_volume, FALSE);
gtk_box_pack_start(GTK_BOX(bbox), profiles->pr_volume, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(bbox), profiles->pr_volume, FALSE, TRUE, 0);
@ -332,7 +344,11 @@ static void _profiles_settings(Profiles * profiles)
gtk_container_add(GTK_CONTAINER(frame), widget); gtk_container_add(GTK_CONTAINER(frame), widget);
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
/* dialog */ /* dialog */
#if GTK_CHECK_VERSION(3, 0, 0)
bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#else
bbox = gtk_hbutton_box_new(); bbox = gtk_hbutton_box_new();
#endif
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 4); gtk_box_set_spacing(GTK_BOX(bbox), 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);

4
src/plugins/smscrypt.c
View File

@ -306,7 +306,11 @@ static void _smscrypt_settings(SMSCrypt * smscrypt)
gtk_window_set_title(GTK_WINDOW(smscrypt->window), "SMS encryption"); gtk_window_set_title(GTK_WINDOW(smscrypt->window), "SMS encryption");
g_signal_connect_swapped(smscrypt->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(smscrypt->window, "delete-event", G_CALLBACK(
_on_settings_closex), smscrypt); _on_settings_closex), smscrypt);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
#endif
/* toolbar */ /* toolbar */
widget = gtk_toolbar_new(); widget = gtk_toolbar_new();
toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_NEW); toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_NEW);