Changeset ebb1489 in mainline for uspace/app/taskbar-cfg/startmenu.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/app/taskbar-cfg/startmenu.c (modified) (8 diffs)

uspace/app/taskbar-cfg/startmenu.c

@@ -515 +515 @@
 
         (void)smee;
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
@@ -534 +535 @@
         (void)startmenu_insert(smenu, entry, &smentry);
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
@@ -620 +622 @@
         startmenu_t *smenu = (startmenu_t *)arg;
         startmenu_entry_t *smentry;
-        errno_t rc;
 
         (void)pbutton;
@@ -628 +629 @@
                 return;
 
-        rc = smenu_entry_destroy(smentry->entry);
-        if (rc != EOK)
-                return;
-
+        smenu_entry_destroy(smentry->entry);
         ui_list_entry_delete(smentry->lentry);
         free(smentry);
+
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
@@ -673 +673 @@
         startmenu_t *smenu = (startmenu_t *)arg;
         startmenu_entry_t *smentry;
-        errno_t rc;
 
         (void)pbutton;
@@ -681 +680 @@
                 return;
 
-        rc = smenu_entry_move_up(smentry->entry);
-        if (rc != EOK)
-                return;
-
+        smenu_entry_move_up(smentry->entry);
         ui_list_entry_move_up(smentry->lentry);
 
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
@@ -700 +697 @@
         startmenu_t *smenu = (startmenu_t *)arg;
         startmenu_entry_t *smentry;
-        errno_t rc;
 
         (void)pbutton;
@@ -708 +704 @@
                 return;
 
-        rc = smenu_entry_move_down(smentry->entry);
-        if (rc != EOK)
-                return;
-
+        smenu_entry_move_down(smentry->entry);
         ui_list_entry_move_down(smentry->lentry);
 
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_sync(smenu->tbarcfg->tbarcfg);
         (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }