depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-09-19 18:05:25 +00:00
Code Issues Releases Wiki Activity

main-window: Change GtkDialog to GtkWindow

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/729>
This commit is contained in:
Anton Lazarev 2024-04-25 19:45:27 -07:00
parent b2f191eaec
commit 72e3ae36ba
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/calls-main-window.c
View file

@ -57,7 +57,7 @@ struct _CallsMainWindow {
CallsAccountOverview *account_overview; CallsAccountOverview *account_overview;
CallsNewCallBox *new_call; CallsNewCallBox *new_call;
GtkDialog *ussd_dialog; GtkWindow *ussd_dialog;
GtkStack *ussd_stack; GtkStack *ussd_stack;
GtkSpinner *ussd_spinner; GtkSpinner *ussd_spinner;
GtkBox *ussd_content; GtkBox *ussd_content;
@ -177,8 +177,8 @@ window_ussd_added_cb (CallsMainWindow *self,
g_object_set_data_full (G_OBJECT (self->ussd_dialog), "ussd", g_object_set_data_full (G_OBJECT (self->ussd_dialog), "ussd",
g_object_ref (ussd), g_object_unref); g_object_ref (ussd), g_object_unref);
window_update_ussd_state (self, ussd); window_update_ussd_state (self, ussd);
gtk_window_set_title (GTK_WINDOW (self->ussd_dialog), _("USSD")); gtk_window_set_title (self->ussd_dialog, _("USSD"));
gtk_window_present (GTK_WINDOW (self->ussd_dialog)); gtk_window_present (self->ussd_dialog);
} }
static void static void
@ -193,7 +193,7 @@ window_ussd_cancel_clicked_cb (CallsMainWindow *self)
if (ussd) if (ussd)
calls_ussd_cancel_async (ussd, NULL, NULL, NULL); calls_ussd_cancel_async (ussd, NULL, NULL, NULL);
gtk_window_close (GTK_WINDOW (self->ussd_dialog)); gtk_window_close (self->ussd_dialog);
} }
static void static void
@ -226,7 +226,7 @@ window_ussd_respond_cb (GObject *object,
response = calls_ussd_respond_finish (ussd, result, &error); response = calls_ussd_respond_finish (ussd, result, &error);
if (error) { if (error) {
gtk_dialog_response (self->ussd_dialog, GTK_RESPONSE_CLOSE); gtk_window_close (self->ussd_dialog);
g_warning ("USSD Error: %s", error->message); g_warning ("USSD Error: %s", error->message);
return; return;
} }
@ -271,7 +271,7 @@ main_window_ussd_send_cb (GObject *object,
ussd = g_task_get_task_data (G_TASK (result)); ussd = g_task_get_task_data (G_TASK (result));
if (error) { if (error) {
gtk_dialog_response (self->ussd_dialog, GTK_RESPONSE_CLOSE); gtk_window_close (self->ussd_dialog);
g_warning ("USSD Error: %s", error->message); g_warning ("USSD Error: %s", error->message);
return; return;
} }
@ -350,7 +350,7 @@ constructed (GObject *object)
G_CALLBACK (window_update_ussd_state), G_CALLBACK (window_update_ussd_state),
self, self,
G_CONNECT_SWAPPED); G_CONNECT_SWAPPED);
gtk_window_set_transient_for (GTK_WINDOW (self->ussd_dialog), GTK_WINDOW (self)); gtk_window_set_transient_for (self->ussd_dialog, GTK_WINDOW (self));
// Add call records // Add call records
history = calls_history_box_new (self->record_store); history = calls_history_box_new (self->record_store);
@ -493,7 +493,7 @@ calls_main_window_dial (CallsMainWindow *self,
calls_new_call_box_send_ussd_async (self->new_call, target, NULL, calls_new_call_box_send_ussd_async (self->new_call, target, NULL,
main_window_ussd_send_cb, self); main_window_ussd_send_cb, self);
gtk_window_present (GTK_WINDOW (self->ussd_dialog)); gtk_window_present (self->ussd_dialog);
} else { } else {
calls_new_call_box_dial (self->new_call, target); calls_new_call_box_dial (self->new_call, target);
} }

4
src/ui/main-window.ui
View file

@ -70,7 +70,7 @@
</object> </object>
</child> </child>
</template> </template>
<object class="GtkDialog" id="ussd_dialog"> <object class="GtkWindow" id="ussd_dialog">
<property name="modal">True</property> <property name="modal">True</property>
<property name="default-width">240</property> <property name="default-width">240</property>
<property name="default-height">200</property> <property name="default-height">200</property>
@ -108,7 +108,7 @@
</child> </child>
</object> </object>
</child> </child>
<child internal-child="content_area"> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>