Bug#1103613: reverted commit ffe942d66cdb1a24d761d9e89c1a4dab49f2400c in fvwm3

[Axel Rohde]

Hi Jaimos,

 

reverting  ffe942d66cdb1a24d761d9e89c1a4dab49f2400c in fvwm3 doesn't work without conflicts, hence the lengthy details below:

 

I cloned the current fvwm source with following last commit: https://github.com/fvwmorg/fvwm3/commit/d49736cb6c814450e967f814dac79c8e1819b8cd

 

# git revert ffe942d66cdb1a24d761d9e89c1a4dab49f2400c
Auto-merging fvwm/add_window.c
CONFLICT (content): Merge conflict in fvwm/add_window.c
Auto-merging fvwm/add_window.h
Auto-merging fvwm/events.c
Auto-merging fvwm/ewmh_names.c
CONFLICT (content): Merge conflict in fvwm/ewmh_names.c
Auto-merging fvwm/session.c
Auto-merging fvwm/style.h
Auto-merging fvwm/update.c
Auto-merging libs/defaults.h
error: could not revert ffe942d6... Fix updating window and icon titles.
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git revert --continue".
hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort".
arohde@debi3 ~/SW/WindowManagers/fvwm3/fvwm3/ 
# git status
On branch main
Your branch is up to date with 'origin/main'.

You are currently reverting commit ffe942d6.
  (fix conflicts and run "git revert --continue")
  (use "git revert --skip" to skip this patch)
  (use "git revert --abort" to cancel the revert operation)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
    modified:   fvwm/add_window.h
    modified:   fvwm/events.c
    modified:   fvwm/session.c
    modified:   fvwm/style.h
    modified:   fvwm/update.c
    modified:   libs/defaults.h

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
    both modified:   fvwm/add_window.c
    both modified:   fvwm/ewmh_names.c

 

 

****  Solved conflicts:  *****

fvwm/add_window.c
 removed:  static void broadcast_window_names(FvwmWindow *fw, int changed_names)

 

 void setup_visible_name(FvwmWindow *fw, Bool is_icon)
   restored the variant of 2.6.7:
   void setup_visible_name(FvwmWindow *fw, Bool is_icon)
   {
       char *ext_name;
       window_style style;

       if (fw == NULL)
       {
           /* should never happen */
           return;
       }

       /* TA:  Get the window style. */
       lookup_style(fw, &style);
       ext_name = interpolate_titleformat_name(fw, &style, is_icon);

       if (is_icon)
       {
           fw->visible_icon_name = strdup(ext_name);
       }
       else
       {
           fw->visible_name = strdup(ext_name);
       }

       free(ext_name);

       return;
   }

fvwm/ewmh_names.c
   int EWMH_WMName(
       FvwmWindow *fw, XEvent *ev, window_style *style, unsigned long any)
   {
       int size = 0;
       char *val;

   //<<<<<<< HEAD
       char *text;
       int what_changed;
   /* =======

       char *tmp_str;
       FlocaleCharset *fc = NULL;
   >>>>>>> parent of ffe942d6 (Fix updating window and icon titles.)
   */   

 

 

./autogen.sh
./configure --enable-mandoc --prefix=/usr

make -j16

umask 022
sudo make install

 

So far, all labels (*FvwmPager: SmallFont) are still present.

I'll keep you updated, in case they disappear.

 

Regards,

  Axel