Mercurial > hg > idav / changeset

--- a/application/settings.c	Thu Nov 28 18:03:12 2024 +0100
+++ b/application/settings.c	Fri Nov 29 22:11:07 2024 +0100
@@ -1106,7 +1106,7 @@
             return repo->url.value.ptr;
         }
         case 2: {
-            return repo->user.value.ptr;
+            return repo->user.value.ptr ? repo->user.value.ptr : repo->stored_user.value.ptr;
         }
         case 3: {
             return repo->full_encryption.value ? "yes" : "no";

--- a/ui/gtk/list.c	Thu Nov 28 18:03:12 2024 +0100
+++ b/ui/gtk/list.c	Fri Nov 29 22:11:07 2024 +0100
@@ -435,7 +435,11 @@
     
     if(args.contextmenu) {
         UIMENU menu = ui_contextmenu_create(args.contextmenu, obj, scroll_area);
+#if GTK_MAJOR_VERSION >= 4
         ui_widget_set_contextmenu(scroll_area, menu);
+#else
+        ui_widget_set_contextmenu(view, menu);
+#endif
     }
     
     UI_APPLY_LAYOUT1(current, args);

--- a/ui/gtk/menu.c	Thu Nov 28 18:03:12 2024 +0100
+++ b/ui/gtk/menu.c	Fri Nov 29 22:11:07 2024 +0100
@@ -254,8 +254,8 @@
     ls->userdata = il->userdata;
     
     UiObserver *observer = ui_observer_new((ui_callback)ui_update_menuitem_list, ls);
-    list->observers = ui_obsvlist_add(list->observers, observer);
-    uic_list_register_observer_destructor(obj->ctx, list, observer);
+    ls->list->observers = ui_obsvlist_add(ls->list->observers, observer);
+    uic_list_register_observer_destructor(obj->ctx, ls->list, observer);
     
     ui_update_menuitem_list(NULL, ls);
 }

--- a/ui/gtk/window.c	Thu Nov 28 18:03:12 2024 +0100
+++ b/ui/gtk/window.c	Fri Nov 29 22:11:07 2024 +0100
@@ -126,8 +126,8 @@
         gtk_window_set_title(GTK_WINDOW(obj->widget), title);
     }
     
-    char *width = ui_get_property("ui.window.width");
-    char *height = ui_get_property("ui.window.height");
+    const char *width = ui_get_property("ui.window.width");
+    const char *height = ui_get_property("ui.window.height");
     if(width && height) {
         gtk_window_set_default_size(
                 GTK_WINDOW(obj->widget),