Only in ./: .deps
diff -r ./dialog.c ../../popupmenu_orig/popupmenu/src/dialog.c
54c54
< //#if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
---
> #if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
69,81c69,81
< //#elif MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
< //static const int        TITLE_TOP_PADDING        =  0;
< //static const int        TITLE_BOTTOM_PADDING     =  25;
< //static const int        TITLE_LEFT_PADDING       =  25;
< //static const int        TITLE_RIGHT_PADDING      =  25;
< 
< //static const int        MESSAGE_TOP_PADDING      =   0;
< //static const int        MESSAGE_BOTTOM_PADDING   =   80;
< //static const int        MESSAGE_LEFT_PADDING     =   0;
< //static const int        MESSAGE_RIGHT_PADDING    =   0;
< //#else
< //#error "Unhandled machine type"
< //#endif
---
> #elif MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
> static const int        TITLE_TOP_PADDING        =   0;
> static const int        TITLE_BOTTOM_PADDING     =  25;
> static const int        TITLE_LEFT_PADDING       =  25;
> static const int        TITLE_RIGHT_PADDING      =  25;
> 
> static const int        MESSAGE_TOP_PADDING      =   0;
> static const int        MESSAGE_BOTTOM_PADDING   =  80;
> static const int        MESSAGE_LEFT_PADDING     =   0;
> static const int        MESSAGE_RIGHT_PADDING    =   0;
> #else
> #error "Unhandled machine type"
> #endif
443c443
< //#if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
---
> #if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
447c447
< //#endif    
---
> #endif    
538c538
< //#if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
---
> #if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
557c557
< //#elif MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
---
> #elif MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
561,564c561,564
<     //widget = gtk_vbox_new(FALSE, 0);
<     //gtk_container_add(GTK_CONTAINER(window), widget);
<     //gtk_widget_show(widget);
<     //vbox = GTK_BOX(widget);   
---
>     widget = gtk_vbox_new(FALSE, 0);
>     gtk_container_add(GTK_CONTAINER(window), widget);
>     gtk_widget_show(widget);
>     vbox = GTK_BOX(widget);   
568,573c568,573
<     //widget = gtk_alignment_new(0.0, 0.0, 0.0, 0.0);
<     //gtk_box_pack_start(vbox, widget, TRUE, TRUE, 0);
<     //gtk_widget_show(widget);
< //#else
< //#error "Unhandled machine type"
< //#endif     
---
>     widget = gtk_alignment_new(0.0, 0.0, 0.0, 0.0);
>     gtk_box_pack_start(vbox, widget, TRUE, TRUE, 0);
>     gtk_widget_show(widget);
> #else
> #error "Unhandled machine type"
> #endif     
591c591
< //#if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
---
> #if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
597c597
< //#endif    
---
> #endif    
620c620
< //#if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
---
> #if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
624,628c624,628
< //#elif MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
< //    gtk_widget_set_size_request(widget, 1024, -1);
< //#else
< //#error "Unhandled machine type"
< //#endif    
---
> #elif MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
>     gtk_widget_set_size_request(widget, 1024, -1);
> #else
> #error "Unhandled machine type"
> #endif    
Only in ./: dialog.c~
Only in ./: dialog.o
Only in ./: diff_popupmenu.txt
Only in ./: ipc.o
Only in ./: main.o
Only in ./: Makefile
Only in ./: Makefile.in
diff -r ./menustore.c ../../popupmenu_orig/popupmenu/src/menustore.c
210,212c210,212
<     //menustore_add_item( "lock",            "system_bottom", _("Lock Sensors"),  "lock");
<     //menustore_add_item( "eject_card",      "system_bottom", _("Safely Remove"), "eject_card");
<     menustore_add_item( "shutdown",        "system_bottom", _("Suspend Device"),"shutdown");
---
>     menustore_add_item( "lock",            "system_bottom", _("Lock Sensors"),  "lock");
>     menustore_add_item( "eject_card",      "system_bottom", _("Safely Remove"), "eject_card");
>     menustore_add_item( "shutdown",        "system_bottom", _("Turn Off Device"),"shutdown");
214c214
<     //menustore_set_item_state("eject_card", "system_bottom", "disabled");
---
>     menustore_set_item_state("eject_card", "system_bottom", "disabled");
227,229c227,229
<     //menustore_set_item_label("lock",            "system_bottom", _("Lock Sensors"));
<     //menustore_set_item_label("eject_card",      "system_bottom", _("Safely Remove"));
<     menustore_set_item_label("shutdown",        "system_bottom", _("Suspend Device"));
---
>     menustore_set_item_label("lock",            "system_bottom", _("Lock Sensors"));
>     menustore_set_item_label("eject_card",      "system_bottom", _("Safely Remove"));
>     menustore_set_item_label("shutdown",        "system_bottom", _("Turn Off Device"));
Only in ./: menustore.c~
Only in ./: menustore.o
Only in ./: pixlist.o
Only in ./: popupmenu
Only in ./: popup.o
diff -r ./statusbar.c ../../popupmenu_orig/popupmenu/src/statusbar.c
182,194c182,183
<     if ( index == 0 ||
< 	 index == 1 ||
< 	 index == 3 ||
< 	 index == 4 || 
<          index == 6 ||
<          index == 7 ||
<          index == 8 ||
<          index == 10 ||
<          index == 11 ||
<          index == 13 ) {
<       gtk_toolbar_insert(GTK_TOOLBAR(statusbar), GTK_TOOL_ITEM(toolitem), -1);
<       gtk_widget_show(toolitem);
<     }
---
>     gtk_toolbar_insert(GTK_TOOLBAR(statusbar), GTK_TOOL_ITEM(toolitem), -1);
>     gtk_widget_show(toolitem);
695c684
< //#if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
---
> #if MACHINE_IS_DR800SG || MACHINE_IS_DR800S || MACHINE_IS_DR800SW
700,707c689,696
< //#elif MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
< //    const gint four_bars_limit  = 75;
< //    const gint three_bars_limit = 50;
< //    const gint two_bars_limit   = 25;
< //    const gint one_bar_limit    = 10;
< //#else
< //#error "Unhandled machine type"
< //#endif
---
> #elif MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
>     const gint four_bars_limit  = 75;
>     const gint three_bars_limit = 50;
>     const gint two_bars_limit   = 25;
>     const gint one_bar_limit    = 10;
> #else
> #error "Unhandled machine type"
> #endif
944,945c933
< //#if MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
< #if 0
---
> #if MACHINE_IS_DR1000S || MACHINE_IS_DR1000SW
Only in ./: statusbar.c~
Only in ./: statusbar.o
diff -r ./taskbar.c ../../popupmenu_orig/popupmenu/src/taskbar.c
183c183
<     taskbar_add_task(FOLDER_XID, _("Explorer"));
---
>     taskbar_add_task(FOLDER_XID, _("Folder"));
Only in ./: taskbar.c~
Only in ./: taskbar.o
